Merge lp:~mvo/snappy-hub/lp1480248-norootwait into lp:~snappy-dev/snappy-hub/snappy-systems

[Michael Vogt]

Remove the "rootwait" kernel commandline to ensure that a broken initrd.img does not cause a hang (LP: 1480248)

[Oliver Grawert (ogra)]

looks good

review: Approve

[lp:~mvo/snappy-hub/lp1480248-norootwait]

11. By Michael Vogt on 2015-08-25

bump version

[Sergio Schvezov (sergiusens)]

I thought we needed rootwait for azure

[Michael Vogt (mvo)]

Hm, good point. So far this change is only done on the BBB which is not available in azure (right?). On generic amd64 we do not set rootwait AFAICS.

[Oliver Grawert (ogra)]

yeah, the kernel cmdline is pretty arch specific ... though it would make the azure image fail if there was a broken initrd ... why do we need rootwait (vs just relying on wait--for-root in the initrd mount scripts) on azure, thats kind of redundant ?

=== modified file 'beagleblack/meta/package.yaml'
--- beagleblack/meta/package.yaml	2015-07-23 12:07:49 +0000
+++ beagleblack/meta/package.yaml	2015-08-25 10:34:35 +0000
@@ -1,7 +1,7 @@
 name: beagleblack
 vendor: Sergio Schvezov <[e-mail]>
 icon: meta/element14.png
-version: 1.11
+version: 1.12
 type: oem
 
 immutable-config:

=== modified file 'beagleblack/uboot.env'
Binary files beagleblack/uboot.env	2015-07-23 12:05:59 +0000 and beagleblack/uboot.env	2015-08-25 10:34:35 +0000 differ
=== modified file 'beagleblack/uboot.env.in'
--- beagleblack/uboot.env.in	2015-07-23 12:05:59 +0000
+++ beagleblack/uboot.env.in	2015-08-25 10:34:35 +0000
@@ -38,7 +38,6 @@
 mmcdev=0
 mmcloados=run mmcargs; if test ${boot_fdt} = yes || test ${boot_fdt} = try; then if run loadfdt; then bootz ${loadaddr} - ${fdtaddr}; else if test ${boot_fdt} = try; then bootz; else echo WARN: Cannot load the DT; fi; fi; else bootz; fi;
 mmcroot=/dev/mmcblk0p2 ro
-mmcrootfstype=ext4 rootwait
 netargs=setenv bootargs console=${console} ${optargs} root=/dev/nfs nfsroot=${serverip}:${rootpath},${nfsopts} rw ip=dhcp
 netboot=echo Booting from network ...; setenv autoload no; dhcp; run netloadimage; run netloadfdt; run netargs; bootz ${loadaddr} - ${fdtaddr}
 netloadfdt=tftp ${fdtaddr} ${fdtfile}