diff options
Diffstat (limited to 'meta/recipes-core/initrdscripts/files')
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-live.sh | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh index d852c5737f..f698535980 100644 --- a/meta/recipes-core/initrdscripts/files/init-live.sh +++ b/meta/recipes-core/initrdscripts/files/init-live.sh | |||
@@ -214,11 +214,7 @@ mount_and_boot() { | |||
214 | boot_live_root | 214 | boot_live_root |
215 | } | 215 | } |
216 | 216 | ||
217 | case $label in | 217 | if [ "$label" != "boot" -a -f $label.sh ] ; then |
218 | boot) | ||
219 | mount_and_boot | ||
220 | ;; | ||
221 | install|install-efi) | ||
222 | if [ -f /run/media/$i/$ISOLINUX/$ROOT_IMAGE ] ; then | 218 | if [ -f /run/media/$i/$ISOLINUX/$ROOT_IMAGE ] ; then |
223 | ./$label.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode $console_params | 219 | ./$label.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode $console_params |
224 | else | 220 | else |
@@ -226,10 +222,8 @@ case $label in | |||
226 | fi | 222 | fi |
227 | 223 | ||
228 | # If we're getting here, we failed... | 224 | # If we're getting here, we failed... |
229 | fatal "Installation image failed" | 225 | fatal "Target $label failed" |
230 | ;; | 226 | fi |
231 | *) | 227 | |
232 | # Not sure what boot label is provided. Try to boot to avoid locking up. | 228 | mount_and_boot |
233 | mount_and_boot | 229 | |
234 | ;; | ||
235 | esac | ||