[SCM] live-build branch, debian, updated. debian/3.0_a42-1-25-g6c98972
Daniel Baumann
daniel at debian.org
Mon Feb 6 22:26:22 UTC 2012
The following commit has been merged in the debian branch:
commit d9a0202d1b1958a9e91601886d36ac50fca22d45
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