summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDrew Moseley <drew_moseley@mentor.com>2014-06-28 17:57:34 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-29 08:57:57 +0100
commit98353862c08be2f1724aaad7aa4ed0521e3621f2 (patch)
treea519fe663f27d0f1a3542f57c79e765ed2214c55
parent7d61661348cf48cbe379ae600565840ea08664b1 (diff)
downloadopenembedded-core-contrib-98353862c08be2f1724aaad7aa4ed0521e3621f2.tar.gz
openembedded-core-contrib-98353862c08be2f1724aaad7aa4ed0521e3621f2.tar.bz2
openembedded-core-contrib-98353862c08be2f1724aaad7aa4ed0521e3621f2.zip
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@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/initrdscripts/files/init-live.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
index 0be9b6fb48..28219641a4 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