From 511dbdbc9a7d63f0020da6221c8578669ffa6412 Mon Sep 17 00:00:00 2001 From: California Sullivan Date: Fri, 28 Jul 2017 15:20:02 -0700 Subject: initramfs-framework/setup-live: remove superfluous break This causes us to fall out of the module setup/run loop in the base init script should "root=" be defined, causing a boot failure. (From OE-Core rev: 4f109da34a080c0d7cb86eaea1f7b6dfef3d04cb) Signed-off-by: California Sullivan Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-core/initrdscripts/initramfs-framework/setup-live | 2 -- 1 file changed, 2 deletions(-) (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/setup-live b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live index ec4a139084..591c93a962 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework/setup-live +++ b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live @@ -49,8 +49,6 @@ shelltimeout=30 done # The existing rootfs module has no support for rootfs images. Assign the rootfs image. bootparam_root="/run/media/$ROOT_DISK/$ISOLINUX/$ROOT_IMAGE" - else - break fi if [ "$bootparam_LABEL" != "boot" -a -f /init.d/$bootparam_LABEL.sh ] ; then -- cgit v1.2.3-54-g00ecf