Makefile | 2 +-
tools/livecd-iso-to-disk.sh | 22 ++++++++++++++--------
2 files changed, 15 insertions(+), 9 deletions(-)
New commits:
commit dc7412038e2324de5cf2a4f209d95e32b679fed6
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Thu Sep 6 16:56:49 2012 -0700
Version 17.15
diff --git a/Makefile b/Makefile
index cccd82c..7329fd6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION = 17.14
+VERSION = 17.15
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
commit 93b9ba6be19af0b9436d1d9dcc5768048e0d3bf1
Author: Brian C. Lane <bcl(a)redhat.com>
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 cd9a89c..fd10232 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 9b6c0e067714989241308339fbaae39fb7f0159a
Author: Brian C. Lane <bcl(a)redhat.com>
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 71fb288..cd9a89c 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