Nested VM refresh

- add debug tools and packages
- update buildroot to version 2017.05.2

Change-Id: I27458d12fb52244c952f2fbc46b38b72cf289fad
Signed-off-by: Peter Mikus <pmikus@cisco.com>

4 files changed, 8 insertions, 8 deletions

diff --git a/resources/tools/disk-image-builder/nested/image-patches/01-serial-console b/resources/tools/disk-image-builder/nested/image-patches/01-serial-console
index 99b6f7f3c8..8dfede413b 100755
--- a/resources/tools/disk-image-builder/nested/image-patches/01-serial-console
+++ b/resources/tools/disk-image-builder/nested/image-patches/01-serial-console
@@ -8,9 +8,9 @@ patch boot/grub/menu.lst <<"_EOF"
 > serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
 > terminal --timeout=0 serial console
 15c17
-< 	kernel /boot/bzImage rw root=/dev/sda1
+< 	kernel /boot/bzImage rw root=/dev/sda1 rootwait
 ---
-> 	kernel /boot/bzImage rw root=/dev/sda1 console=ttyS0,115200n8
+> 	kernel /boot/bzImage rw root=/dev/sda1 rootwait console=ttyS0,115200n8
 _EOF
 
 patch etc/inittab <<"_EOF"
diff --git a/resources/tools/disk-image-builder/nested/image-patches/03-network b/resources/tools/disk-image-builder/nested/image-patches/03-network
index ca5c4f952d..e7d215c00a 100755
--- a/resources/tools/disk-image-builder/nested/image-patches/03-network
+++ b/resources/tools/disk-image-builder/nested/image-patches/03-network
@@ -2,9 +2,9 @@
 
 patch boot/grub/menu.lst <<"_EOF"
 17c17
-< 	kernel /boot/bzImage rw root=/dev/sda1 console=ttyS0,115200n8
+< 	kernel /boot/bzImage rw root=/dev/sda1 rootwait console=ttyS0,115200n8
 ---
-> 	kernel /boot/bzImage rw root=/dev/sda1 ipv6.disable=1 console=ttyS0,115200n8
+> 	kernel /boot/bzImage rw root=/dev/sda1 rootwait ipv6.disable=1 console=ttyS0,115200n8
 _EOF
 
 patch etc/network/interfaces <<"_EOF"
diff --git a/resources/tools/disk-image-builder/nested/image-patches/07-isolate-cpu b/resources/tools/disk-image-builder/nested/image-patches/07-isolate-cpu
index 401966deac..f057a51b0e 100755
--- a/resources/tools/disk-image-builder/nested/image-patches/07-isolate-cpu
+++ b/resources/tools/disk-image-builder/nested/image-patches/07-isolate-cpu
@@ -2,7 +2,7 @@
 
 patch boot/grub/menu.lst <<"_EOF"
 17c17
-< 	kernel /boot/bzImage rw root=/dev/sda1 ipv6.disable=1 console=ttyS0,115200n8
+< 	kernel /boot/bzImage rw root=/dev/sda1 rootwait ipv6.disable=1 console=ttyS0,115200n8
 ---
-> 	kernel /boot/bzImage rw root=/dev/sda1 ipv6.disable=1 console=ttyS0,115200n8 isolcpus=1,2,3,4 nohz_full=1,2,3,4 rcu_nocbs=1,2,3,4 intel_pstate=disable
+> 	kernel /boot/bzImage rw root=/dev/sda1 rootwait ipv6.disable=1 console=ttyS0,115200n8 isolcpus=1,2,3,4 nohz_full=1,2,3,4 rcu_nocbs=1,2,3,4 intel_pstate=disable
 _EOF
diff --git a/resources/tools/disk-image-builder/nested/image-patches/08-virtio-disk b/resources/tools/disk-image-builder/nested/image-patches/08-virtio-disk
index 5ef2782d52..6e6feaecc5 100644..100755
--- a/resources/tools/disk-image-builder/nested/image-patches/08-virtio-disk
+++ b/resources/tools/disk-image-builder/nested/image-patches/08-virtio-disk
@@ -2,7 +2,7 @@
 
 patch boot/grub/menu.lst <<"_EOF"
 17c17
-<       kernel /boot/bzImage rw root=/dev/sda1 ipv6.disable=1 console=ttyS0,115200n8 isolcpus=1,2,3,4 nohz_full=1,2,3,4 rcu_nocbs=1,2,3,4 intel_pstate=disable
+< 	kernel /boot/bzImage rw root=/dev/sda1 rootwait ipv6.disable=1 console=ttyS0,115200n8 isolcpus=1,2,3,4 nohz_full=1,2,3,4 rcu_nocbs=1,2,3,4 intel_pstate=disable
 ---
->       kernel /boot/bzImage rw root=/dev/vda1 ipv6.disable=1 console=ttyS0,115200n8 isolcpus=1,2,3,4 nohz_full=1,2,3,4 rcu_nocbs=1,2,3,4 intel_pstate=disable noapic
+> 	kernel /boot/bzImage rw root=/dev/vda1 rootwait ipv6.disable=1 console=ttyS0,115200n8 isolcpus=1,2,3,4 nohz_full=1,2,3,4 rcu_nocbs=1,2,3,4 intel_pstate=disable noapic
 _EOF