[oe-commits] Drew Moseley : initrdscripts: Try to boot if boot label is unknown

git at git.openembedded.org git at git.openembedded.org
Sun Jun 29 08:04:50 UTC 2014


Module: openembedded-core.git
Branch: master
Commit: 98353862c08be2f1724aaad7aa4ed0521e3621f2
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=98353862c08be2f1724aaad7aa4ed0521e3621f2

Author: Drew Moseley <drew_moseley at mentor.com>
Date:   Sat Jun 28 17:57:34 2014 -0400

initrdscripts: Try to boot if boot label is unknown

The init-live.sh scripts assumes that the boot label set by
the LABELS variable is either "boot", "install", or
"install-efi".  If that variable is overridden to something else
we fall off the end of the case statement and the system locks
up.  If the boot label is unknown, at least attempt to boot.

Signed-off-by: Drew Moseley <drew_moseley at mentor.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-core/initrdscripts/files/init-live.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
index 0be9b6f..2821964 100644
--- a/meta/recipes-core/initrdscripts/files/init-live.sh
+++ b/meta/recipes-core/initrdscripts/files/init-live.sh
@@ -220,4 +220,8 @@ case $label in
 	# If we're getting here, we failed...
 	fatal "Installation image failed"
 	;;
+    *)
+	# Not sure what boot label is provided.  Try to boot to avoid locking up.
+	mount_and_boot
+	;;
 esac



More information about the Openembedded-commits mailing list