[SCM] debian-live branch, master, updated. 1.0_a47-1-38-g64d2e53

Chris Lamb chris at chris-lamb.co.uk
Sun Jun 15 15:55:46 UTC 2008


The following commit has been merged in the master branch:
commit 64d2e53e0741967c69c0c23c3b331cc0d429f075
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sun Jun 15 16:51:49 2008 +0100

    Only deference symlinks on usb-hdd filesystems that do not support symlinks.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd
index 6dee10d..7977d8b 100755
--- a/helpers/lh_binary_usb-hdd
+++ b/helpers/lh_binary_usb-hdd
@@ -187,9 +187,15 @@ case "${LH_CHROOT_BUILD}" in
 		;;
 esac
 
+case "${LH_BINARY_FILESYSTEM}" in
+	fat*)
+		CP_OPTIONS="-L"
+		;;
+esac
+
 mkdir -p chroot/binary.tmp
 ${LH_ROOT_COMMAND} mount ${FREELO} chroot/binary.tmp
-cp -rL binary/* chroot/binary.tmp
+cp -r ${CP_OPTIONS} binary/* chroot/binary.tmp
 
 FIXME()
 {

-- 
debian-live



More information about the debian-live-changes mailing list