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 09:04:21 +0100
commit184dddfb9a852d954900ff68abfdf36ea143a647 (patch)
tree7559ea4c954f6308a7eab3354eca9a2c74f5ec2e
parent946fb184bf986b8bde2fe0502d48f69bc7cd4a18 (diff)
downloadpoky-184dddfb9a852d954900ff68abfdf36ea143a647.tar.gz
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. (From OE-Core rev: 98353862c08be2f1724aaad7aa4ed0521e3621f2) 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
220 # If we're getting here, we failed... 220 # If we're getting here, we failed...
221 fatal "Installation image failed" 221 fatal "Installation image failed"
222 ;; 222 ;;
223 *)
224 # Not sure what boot label is provided. Try to boot to avoid locking up.
225 mount_and_boot
226 ;;
223esac 227esac