From 64f7feb5c37d06e1985c59106cf2f7cd286fd0b8 Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Tue, 3 Jul 2012 21:05:46 -0700 Subject: EFI: Make installer EFI aware [YOCTO #1919] Create a basic EFI installer script modeled after the existing installer and add it to a new initramfs-live-install-efi recipe. Update the init-live.sh script to distinguish between LABEL=install and LABEL=install-efi and select the appropriate script. Add the efi installer to core-image-minimal-initramfs. Update grub-efi.bbclass to use "LABEL=install-efi" when it detects a label of "install". This is clearly not ideal, but a proper fix would involve decoupling the LABELS assignment from the image-live.bbclass usage of SYSLINUX_LABELS. We should be able to address that in a follow-on clean-up series. V2: Include missing initramfs-live-install-efi_1.0.bb V3: Rebase after Radu's console_params fix (From OE-Core rev: 4bce3417917a3e88ba6529db394525fba82e0699) Signed-off-by: Darren Hart Signed-off-by: Richard Purdie --- meta/recipes-core/initrdscripts/files/init-live.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-core/initrdscripts/files/init-live.sh') diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh index d5e241a620..3fba7dc3a1 100644 --- a/meta/recipes-core/initrdscripts/files/init-live.sh +++ b/meta/recipes-core/initrdscripts/files/init-live.sh @@ -116,11 +116,11 @@ case $label in fi fi ;; - install) + install|install-efi) if [ -f /media/$i/$ISOLINUX/$ROOT_IMAGE ] ; then - ./install.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode $console_params + ./$label.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode $console_params else - fatal "Could not find install script" + fatal "Could not find $label script" fi # If we're getting here, we failed... -- cgit v1.2.3-54-g00ecf