summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2017-07-28 15:20:02 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-09 09:24:16 +0100
commit511dbdbc9a7d63f0020da6221c8578669ffa6412 (patch)
treea2f26895a69627d4eafe82c8c293f3fd61128834 /meta/recipes-core
parent4b2fb6212650ba5594b8c72765b9ce8fe59e4bdc (diff)
downloadpoky-511dbdbc9a7d63f0020da6221c8578669ffa6412.tar.gz
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>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-framework/setup-live2
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 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
49 done 49 done
50 # The existing rootfs module has no support for rootfs images. Assign the rootfs image. 50 # The existing rootfs module has no support for rootfs images. Assign the rootfs image.
51 bootparam_root="/run/media/$ROOT_DISK/$ISOLINUX/$ROOT_IMAGE" 51 bootparam_root="/run/media/$ROOT_DISK/$ISOLINUX/$ROOT_IMAGE"
52 else
53 break
54 fi 52 fi
55 53
56 if [ "$bootparam_LABEL" != "boot" -a -f /init.d/$bootparam_LABEL.sh ] ; then 54 if [ "$bootparam_LABEL" != "boot" -a -f /init.d/$bootparam_LABEL.sh ] ; then