[oe-commits] [openembedded-core] 11/25: initramfs-framework/setup-live: remove superfluous break
git at git.openembedded.org
git at git.openembedded.org
Wed Aug 9 08:38:59 UTC 2017
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master
in repository openembedded-core.
commit 4f109da34a080c0d7cb86eaea1f7b6dfef3d04cb
Author: California Sullivan <california.l.sullivan at intel.com>
AuthorDate: 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.
Signed-off-by: California Sullivan <california.l.sullivan at intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/recipes-core/initrdscripts/initramfs-framework/setup-live | 2 --
1 file changed, 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
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list