[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7090/8267] initramfs-framework/setup-live: remove superfluous break



commit 511dbdbc9a7d63f0020da6221c8578669ffa6412
Author: California Sullivan <california l sullivan intel com>
Date:   Fri Jul 28 15:20:02 2017 -0700

    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 <california l sullivan intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../initrdscripts/initramfs-framework/setup-live   |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/setup-live 
b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live
index ec4a139..591c93a 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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]