[SCM] live-build branch, debian-next, updated. debian/3.0_a42-1-21-gb0f1e3c

Daniel Baumann daniel at debian.org
Sat Feb 4 21:36:10 UTC 2012


The following commit has been merged in the debian-next branch:
commit b0f1e3c8b32aa1e2f7652381526b4a391ad41ece
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Feb 4 22:35:39 2012 +0100

    Dereferencing potential symlinked apt preference files in chroot_apt/*.pref.

diff --git a/scripts/build/lb_chroot_apt b/scripts/build/lb_chroot_apt
index f981c52..95c6159 100755
--- a/scripts/build/lb_chroot_apt
+++ b/scripts/build/lb_chroot_apt
@@ -117,7 +117,7 @@ case "${1}" in
 					mv chroot/etc/apt/preferences.d/$(basename ${_FILE}) chroot/etc/apt/preferences.d/$(basename ${_FILE}).orig
 				fi
 
-				cp ${_FILE} chroot/etc/apt/preferences.d
+				cp -aL ${_FILE} chroot/etc/apt/preferences.d
 			done
 		fi
 
@@ -270,7 +270,7 @@ EOF
 					mv chroot/etc/apt/preferences.d/$(basename ${_FILE}) chroot/etc/apt/preferences.d/$(basename ${_FILE}).orig
 				fi
 
-				cp ${_FILE} chroot/etc/apt/preferences.d
+				cp -aL ${_FILE} chroot/etc/apt/preferences.d
 
 				if [ -f chroot/etc/apt/preferences.d/$(basename ${_FILE}) ]
 				then

-- 
live-build



More information about the debian-live-changes mailing list