[SCM] debian-live branch, master, updated. 1.0_a48-1-17-g80e59fb

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 80e59fb47204b866dfabbc6382e8cc09b0b9eac2
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Aug 7 19:45:24 2008 +0200

    Only using hardlinks for local-packages when hardlinks are possible.

diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources
index 4c763cb..9da2c0d 100755
--- a/helpers/lh_chroot_sources
+++ b/helpers/lh_chroot_sources
@@ -85,15 +85,20 @@ case "${1}" in
 			rm -rf chroot/root/local-packages
 			mkdir -p chroot/root/local-packages
 
+			if [ "$(stat --printf %d config/chroot_local-packages)" = "$(stat --printf %d chroot/root/local-packages)" ]
+			then
+				CP_OPTIONS="-l"
+			fi
+
 			# Copy packages
 			if ls config/chroot_local-packages/*_"${LH_ARCHITECTURE}".deb > /dev/null 2>&1
 			then
-				cp -l config/chroot_local-packages/*_"${LH_ARCHITECTURE}".deb chroot/root/local-packages
+				cp ${CP_OPTIONS} config/chroot_local-packages/*_"${LH_ARCHITECTURE}".deb chroot/root/local-packages
 			fi
 
 			if ls config/chroot_local-packages/*_all.deb > /dev/null 2>&1
 			then
-				cp -l config/chroot_local-packages/*_all.deb chroot/root/local-packages
+				cp ${CP_OPTIONS} config/chroot_local-packages/*_all.deb chroot/root/local-packages
 			fi
 
 			if ls chroot/root/local-packages/*.deb > /dev/null 2>&1

-- 
debian-live