From: Chris Gianelloni Date: Tue, 13 Feb 2007 00:13:07 +0000 (+0000) Subject: Disabled deleting of /boot so we actually can work with EFI/grub, made EFI check... X-Git-Tag: CATALYST_2_0_6_916~278 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8bfb08b16fbfd1dc6fcfa766e24a8bbbc09c1a7e;p=catalyst.git Disabled deleting of /boot so we actually can work with EFI/grub, made EFI check look in the correct location, and made sure we don't delete /voot within the EFI code if grub is present. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1216 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index ca86afc7..6366fae7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 13 Feb 2007; Chris Gianelloni + targets/support/bootloader-setup.sh, targets/support/create-iso.sh: + Disabled deleting of /boot so we actually can work with EFI/grub, made EFI + check look in the correct location, and made sure we don't delete /voot + within the EFI code if grub is present. + 12 Feb 2007; Chris Gianelloni modules/generic_stage_target.py: Added another fix from Andrew Gaffney from bug diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh index 5377c8c1..f6c62396 100755 --- a/targets/support/bootloader-setup.sh +++ b/targets/support/bootloader-setup.sh @@ -340,8 +340,7 @@ case ${clst_hostarch} in x86|amd64) if [ -e $1/isolinux/isolinux.bin ] then - mv $1/boot/* $1/isolinux - rmdir $1/boot + cp -f $1/boot/* $1/isolinux # the rest of this function sets up the config file for isolinux icfg=$1/isolinux/isolinux.cfg kmsg=$1/isolinux/kernels.msg @@ -429,6 +428,7 @@ case ${clst_hostarch} in if [ -e $1/boot/efi/elilo.efi ] then + [ -e $1/isolinux/elilo.efi ] && rm -f $1/isolinux/elilo.efi iacfg=$1/boot/elilo.conf echo 'prompt' > ${iacfg} echo 'message=/efi/boot/elilo.msg' >> ${iacfg} diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh index 1999668f..026f5b80 100755 --- a/targets/support/create-iso.sh +++ b/targets/support/create-iso.sh @@ -360,15 +360,15 @@ case ${clst_hostarch} in umount ${clst_target_path}/gentoo.efimg.mountPoint rmdir ${clst_target_path}/gentoo.efimg.mountPoint + if [ ! -e ${clst_target_path}/boot/grub/stage2_eltorito ] + then + echo "Removing /boot" + rm -rf ${clst_target_path}/boot + fi else echo "Found populated EFI image at \ ${clst_target_path}/gentoo.efimg" fi - if [ ! -e ${clst_target_path}/boot/grub/stage2_eltorito ] - then - echo "Removing /boot" - rm -rf ${clst_target_path}/boot - fi fi if [ -e ${clst_target_path}/isolinux/isolinux.bin ]