Makefile | 2 +-
tools/livecd-iso-to-disk.sh | 26 ++++++++++++++++++--------
2 files changed, 19 insertions(+), 9 deletions(-)
New commits:
commit 15fc1fd3f0996167e8b4ef1d34a444efe405133c
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Tue Sep 27 13:47:02 2011 -0700
Version 14.4
diff --git a/Makefile b/Makefile
index e6f67eb..b98b6eb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION = 14.3
+VERSION = 14.4
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
commit cb54e793d7558157dd2d8b824a866dda794ce106
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Wed Mar 16 10:42:42 2011 -0700
Support /EFI/BOOT or /EFI/boot (#688258)
Some iso's use lower case. Upper case is correct, but both work.
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 16302c1..9a311d6 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -397,6 +397,8 @@ copyFile() {
cp "$1" "$2"
}
+shopt -s extglob
+
cryptedhome=1
keephome=1
homesizemb=0
@@ -599,9 +601,15 @@ if [ -f "$USBMNT/$LIVEOS/$HOMEFILE" -a -n
"$keephome" -a "$homesizemb" -gt 0 ];
exitclean
fi
-if [ -n "$efi" -a ! -d $CDMNT/EFI/boot ]; then
- echo "ERROR: This live image does not support EFI booting"
- exitclean
+if [ -n "$efi" ]; then
+ if [ -d $CDMNT/EFI/BOOT ]; then
+ EFI_BOOT="/EFI/BOOT"
+ elif [ -d $CDMNT/EFI/boot ]; then
+ EFI_BOOT="/EFI/boot"
+ else
+ echo "ERROR: This live image does not support EFI booting"
+ exitclean
+ fi
fi
# let's try to make sure there's enough room on the stick
@@ -700,7 +708,7 @@ fi
# Bootloader is always reconfigured, so keep these out of the if skipcopy stuff.
[ ! -d $USBMNT/$SYSLINUXPATH ] && mkdir -p $USBMNT/$SYSLINUXPATH
-[ -n "$efi" -a ! -d $USBMNT/EFI/boot ] && mkdir -p $USBMNT/EFI/boot
+[ -n "$efi" -a ! -d $USBMNT$EFI_BOOT ] && mkdir -p $USBMNT$EFI_BOOT
# Live image copy
set -o pipefail
@@ -742,11 +750,11 @@ BOOTCONFIG=$USBMNT/$SYSLINUXPATH/isolinux.cfg
# Set this to nothing so sed doesn't care
BOOTCONFIG_EFI=
if [ -n "$efi" ];then
- cp $CDMNT/EFI/boot/* $USBMNT/EFI/boot
+ cp $CDMNT$EFI_BOOT/* $USBMNT$EFI_BOOT
# this is a little ugly, but it gets the "interesting" named config file
- BOOTCONFIG_EFI=$USBMNT/EFI/boot/boot?*.conf
- rm -f $USBMNT/EFI/boot/grub.conf
+ BOOTCONFIG_EFI=$USBMNT$EFI_BOOT/+(BOOT|boot)?*.conf
+ rm -f $USBMNT$EFI_BOOT/grub.conf
fi
echo "Updating boot config file"
@@ -904,7 +912,9 @@ if [ -z "$multi" ]; then
echo "Installing boot loader"
if [ -n "$efi" ]; then
# replace the ia32 hack
- if [ -f "$USBMNT/EFI/boot/boot.conf" ]; then cp -f
$USBMNT/EFI/boot/bootia32.conf $USBMNT/EFI/boot/boot.conf ; fi
+ if [ -f "$USBMNT$EFI_BOOT/boot.conf" ]; then
+ cp -f $USBMNT$EFI_BOOT/bootia32.conf $USBMNT$EFI_BOOT/boot.conf
+ fi
fi
# this is a bit of a kludge, but syslinux doesn't guarantee the API for its com32
modules :/