[SCM] debian-live branch, master, updated. 1.0_a48-1-75-gf5d6f58

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 029e62306b38e0215a5cf35f1ce84924d32e38cf
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Tue Aug 12 19:17:39 2008 +0100

    Ensure the binary image does not inherit the binary stage's APT settings.

diff --git a/helpers/lh_binary b/helpers/lh_binary
index 090d32e..48087c0 100755
--- a/helpers/lh_binary
+++ b/helpers/lh_binary
@@ -40,6 +40,7 @@ then
 	lh_chroot_hosts install ${*}
 	lh_chroot_resolv install ${*}
 	lh_chroot_hostname install ${*}
+	lh_chroot_apt install-binary ${*}
 	lh_chroot_sources install ${*}
 fi
 
diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt
index 1e6ab56..8564bf4 100755
--- a/helpers/lh_chroot_apt
+++ b/helpers/lh_chroot_apt
@@ -32,7 +32,7 @@ Set_defaults
 Require_stagefile .stage/bootstrap
 
 case "${1}" in
-	install)
+	install*)
 		Echo_message "Configuring file /etc/apt/apt.conf"
 
 		# Checking stage file
@@ -114,11 +114,26 @@ case "${1}" in
 
 		if Find_files config/chroot_local-packages/*.deb
 		then
-			# Ensure local packages have priority
 			echo >> chroot/etc/apt/preferences
 			echo "Package: *" >> chroot/etc/apt/preferences
 			echo "Pin: release o=chroot_local-packages" >> chroot/etc/apt/preferences
-			echo "Pin-Priority: 1001" >> chroot/etc/apt/preferences
+
+			case "${1}" in
+				install)
+					# Ensure local packages have priority
+					echo "Pin-Priority: 1001" >> chroot/etc/apt/preferences
+					;;
+
+				install-binary)
+					# Ensure local packages are not re-installed during lh_binary
+					echo "Pin-Priority: 99" >> chroot/etc/apt/preferences
+
+					echo >> chroot/etc/apt/preferences
+					echo "Package: *" >> chroot/etc/apt/preferences
+					echo "Pin: release o=debian" >> chroot/etc/apt/preferences
+					echo "Pin-Priority: 99" >> chroot/etc/apt/preferences
+					;;
+			esac
 		fi
 
 		# Creating stage file
@@ -162,7 +177,7 @@ case "${1}" in
 
 		if Find_files config/chroot_local-packages/*.deb
 		then
-			# Ensure local packages are not re-installed during lh_binary
+			# Ensure local packages are not replaced.
 			echo >> chroot/etc/apt/preferences
 			echo "Package: *" >> chroot/etc/apt/preferences
 			echo "Pin: release o=chroot_local-packages" >> chroot/etc/apt/preferences

-- 
debian-live