Makefile | 2 +- tools/livecd-iso-to-disk.sh | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-)
New commits: commit 34b70606f2da10d073b1a25595e0f29318b04340 Author: Brian C. Lane <[email protected]> Date: Thu Sep 6 17:26:43 2012 -0700 Version 16.16 diff --git a/Makefile b/Makefile index b5c389d..38c6076 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -VERSION = 16.15 +VERSION = 16.16 INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} commit c6649bd82eca65f7d6ab9a206c626dbb289e8d9a Author: Brian C. Lane <[email protected]> Date: Thu Sep 6 15:27:31 2012 -0700 use cp -r instead of -a diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index 479fe85..4807b1f 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -1089,7 +1089,7 @@ BOOTCONFIG=$TGTMNT/$SYSLINUXPATH/isolinux.cfg BOOTCONFIG_EFI= if [ -n "$efi" ]; then echo "Setting up $EFI_BOOT" - cp -a $SRCMNT$EFI_BOOT/* $TGTMNT$EFI_BOOT + cp -r $SRCMNT$EFI_BOOT/* $TGTMNT$EFI_BOOT # The GRUB EFI config file can be one of: # boot?*.conf commit f6e117f22df127757db0bd1a5ca73195b9ff85c7 Author: Brian C. Lane <[email protected]> Date: Wed Sep 5 14:58:59 2012 -0700 New location for GRUB2 config on UEFI (#851220) With Secure Boot and shim the GRUB2 config is no grub.cfg diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index 15de42d..479fe85 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -1089,14 +1089,20 @@ BOOTCONFIG=$TGTMNT/$SYSLINUXPATH/isolinux.cfg BOOTCONFIG_EFI= if [ -n "$efi" ]; then echo "Setting up $EFI_BOOT" - cp $SRCMNT$EFI_BOOT/* $TGTMNT$EFI_BOOT - - # FIXME - # There is a problem here. On older LiveCD's the files are boot?*.conf - # They really should be renamed to BOOT?*.conf - - # this is a little ugly, but it gets the "interesting" named config file - BOOTCONFIG_EFI=$TGTMNT$EFI_BOOT/+(BOOT|boot)?*.conf + cp -a $SRCMNT$EFI_BOOT/* $TGTMNT$EFI_BOOT + + # The GRUB EFI config file can be one of: + # boot?*.conf + # BOOT?*.conf + # grub.cfg + if [ -e $TGTMNT$EFI_BOOT/grub.cfg ]; then + BOOTCONFIG_EFI=$TGTMNT$EFI_BOOT/grub.cfg + elif [ -e $TGTMNT$EFI_BOOT/+(BOOT|boot)?*.conf ]; then + BOOTCONFIG_EFI=$TGTMNT$EFI_BOOT/+(BOOT|boot)?*.conf + else + echo "Unable to find EFI config file." + exitclean + fi rm -f $TGTMNT$EFI_BOOT/grub.conf # On some images (RHEL) the BOOT*.efi file isn't in $EFI_BOOT, but is in -- livecd mailing list [email protected] https://admin.fedoraproject.org/mailman/listinfo/livecd
