aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/initrdscripts/initramfs-framework/setup-live
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:03 +0100
commit4f109da34a080c0d7cb86eaea1f7b6dfef3d04cb (patch)
tree6fae359861760a132af2d65b43359a65481bb724 /meta/recipes-core/initrdscripts/initramfs-framework/setup-live
parent519c34adeb0735f6ff606addd00a7bbe19f4b15c (diff)
downloadopenembedded-core-contrib-4f109da34a080c0d7cb86eaea1f7b6dfef3d04cb.tar.gz
openembedded-core-contrib-4f109da34a080c0d7cb86eaea1f7b6dfef3d04cb.tar.bz2
openembedded-core-contrib-4f109da34a080c0d7cb86eaea1f7b6dfef3d04cb.zip
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. Signed-off-by: California Sullivan <california.l.sullivan@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/initrdscripts/initramfs-framework/setup-live')
-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
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