diff options
| author |   Jérémy Rosen <jeremy.rosen@openwide.fr> | 2016-03-11 11:38:31 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-20 23:12:27 +0000 |
| commit | 21916234dd972d3fcef43c96b842f797dd1947ae (patch) | |
| tree | 7a5b2a92d819abf9f56552824106fdb84d53e66b /meta | |
| parent | 57a525ca7271a8fe3913c61aa87cb0ba1674b4b2 (diff) | |
| download | openembedded-core-contrib-21916234dd972d3fcef43c96b842f797dd1947ae.tar.gz | |
init-live : make it easier to add custom boot targets
When booting from the live image, the label from the bootloader is passed
to init.sh. init.sh uses the label to either boot a live image or call a
script to take over and install the system.
It is possible to add new labels to the bootloader via the LABELS family of
variables, but the names in init.sh were hardcoded to install and
install-efi
this patch checks if a shell script with the same name as the label is
available instead of using a hardcoded list. Any recipe can add such file
and this provide a new boot target to the live image
(From OE-Core rev: 2c10ca0fe612818cb43931b969ad2af5502f1e84)
Signed-off-by: Jérémy Rosen <jeremy.rosen@openwide.fr>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -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() { boot_live_root } -case $label in - boot) - mount_and_boot - ;; - install|install-efi) +if [ "$label" != "boot" -a -f $label.sh ] ; then if [ -f /run/media/$i/$ISOLINUX/$ROOT_IMAGE ] ; then ./$label.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode $console_params else @@ -226,10 +222,8 @@ case $label in fi # 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 + fatal "Target $label failed" +fi + +mount_and_boot + |