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

Proposed by Michael Vogt on 2015-08-25
Status: Merged
Approved by: Oliver Grawert on 2015-08-25
Approved revision: 10
Merged at revision: 10
Proposed branch: lp:~mvo/snappy-hub/lp1480248-norootwait
Merge into: lp:~snappy-dev/snappy-hub/snappy-systems
Diff against target: 26 lines (+1/-2)
2 files modified
beagleblack/meta/package.yaml (+1/-1)
beagleblack/uboot.env.in (+0/-1)
To merge this branch: bzr merge lp:~mvo/snappy-hub/lp1480248-norootwait
Reviewer Review Type Date Requested Status
Oliver Grawert 2015-08-25 Approve on 2015-08-25
Review via email: mp+269032@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Oliver Grawert (ogra) wrote :

looks good

review: Approve
11. By Michael Vogt on 2015-08-25

bump version

Sergio Schvezov (sergiusens) wrote :

I thought we needed rootwait for azure

Michael Vogt (mvo) wrote :

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) wrote :

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 ?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'beagleblack/meta/package.yaml'
2--- beagleblack/meta/package.yaml 2015-07-23 12:07:49 +0000
3+++ beagleblack/meta/package.yaml 2015-08-25 10:34:35 +0000
4@@ -1,7 +1,7 @@
5 name: beagleblack
6 vendor: Sergio Schvezov <sergio.schvezov@canonical.com>
7 icon: meta/element14.png
8-version: 1.11
9+version: 1.12
10 type: oem
11
12 immutable-config:
13
14=== modified file 'beagleblack/uboot.env'
15Binary files beagleblack/uboot.env 2015-07-23 12:05:59 +0000 and beagleblack/uboot.env 2015-08-25 10:34:35 +0000 differ
16=== modified file 'beagleblack/uboot.env.in'
17--- beagleblack/uboot.env.in 2015-07-23 12:05:59 +0000
18+++ beagleblack/uboot.env.in 2015-08-25 10:34:35 +0000
19@@ -38,7 +38,6 @@
20 mmcdev=0
21 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;
22 mmcroot=/dev/mmcblk0p2 ro
23-mmcrootfstype=ext4 rootwait
24 netargs=setenv bootargs console=${console} ${optargs} root=/dev/nfs nfsroot=${serverip}:${rootpath},${nfsopts} rw ip=dhcp
25 netboot=echo Booting from network ...; setenv autoload no; dhcp; run netloadimage; run netloadfdt; run netargs; bootz ${loadaddr} - ${fdtaddr}
26 netloadfdt=tftp ${fdtaddr} ${fdtfile}

Subscribers

People subscribed via source and target branches