[SCM] debian-live branch, master, updated. 1.0_a48-1-98-gea96223

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 4215de2be294d1d919e8512c235bc2ebaecd157b
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Thu Aug 7 20:08:04 2008 +0100

    Test whether to use hard-links when caching d-i downloads.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index c0bb74c..e579eec 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -216,7 +216,12 @@ Download_file () {
 		fi
 	fi
 
-	cp -fl "${_LH_CACHE_FILE}" "${_LH_TARGET}"
+	if [ "$(stat --printf %d "${_LH_CACHE_DIR}")" = "$(stat --printf %d ./)" ]
+	then
+		CP_OPTIONS="-l"
+	fi
+
+	cp -f ${CP_OPTIONS} -- "${_LH_CACHE_FILE}" "${_LH_TARGET}"
 }
 
 VMLINUZ_DI="vmlinuz"

-- 
debian-live