Branch 'f18-branch' - 2 commits - Makefile tools/livecd-iso-to-disk.sh

[Brian C. Lane]

Makefile                    |    2 +-
 tools/livecd-iso-to-disk.sh |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e5635e13282d3a930df158869cfbdd3e2095c098
Author: Brian C. Lane 
Date:   Thu Sep 6 16:38:20 2012 -0700

Version 18.10

diff --git a/Makefile b/Makefile
index c319f77..c3f33a3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@

-VERSION = 18.9
+VERSION = 18.10

INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}

commit acd44429ed4911721e6029e6fd646c1ef395fb91
Author: Brian C. Lane 
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 c681e37..1a87869 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