]> code.ossystems Code Review - openembedded-core.git/commitdiff
initramfs-framework/setup-live: remove superfluous break
authorCalifornia Sullivan <california.l.sullivan@intel.com>
Fri, 28 Jul 2017 22:20:02 +0000 (15:20 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 9 Aug 2017 08:24:03 +0000 (09:24 +0100)
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.

Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-core/initrdscripts/initramfs-framework/setup-live

index ec4a139084d1951bc3b3c431080c5010be9df8cf..591c93a9622401e0ae3d6ee5597ace7f3913e2c7 100644 (file)
@@ -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