manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Chris Lamb 2008-08-12 19:17:39 +01:00 committed by Daniel Baumann
parent 92d14dcccf
commit 029e62306b
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
helpers/lh_binary
View File

@ -40,6 +40,7 @@ then
lh_chroot_hosts install ${*} lh_chroot_hosts install ${*}
lh_chroot_resolv install ${*} lh_chroot_resolv install ${*}
lh_chroot_hostname install ${*} lh_chroot_hostname install ${*}
lh_chroot_apt install-binary ${*}
lh_chroot_sources install ${*} lh_chroot_sources install ${*}
fi fi

23
helpers/lh_chroot_apt
View File

@ -32,7 +32,7 @@ Set_defaults
Require_stagefile .stage/bootstrap Require_stagefile .stage/bootstrap
case "${1}" in case "${1}" in
install) install*)
Echo_message "Configuring file /etc/apt/apt.conf" Echo_message "Configuring file /etc/apt/apt.conf"
# Checking stage file # Checking stage file
@ -114,11 +114,26 @@ case "${1}" in
if Find_files config/chroot_local-packages/*.deb if Find_files config/chroot_local-packages/*.deb
then then
# Ensure local packages have priority
echo >> chroot/etc/apt/preferences echo >> chroot/etc/apt/preferences
echo "Package: *" >> chroot/etc/apt/preferences echo "Package: *" >> chroot/etc/apt/preferences
echo "Pin: release o=chroot_local-packages" >> 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 fi
# Creating stage file # Creating stage file
@ -162,7 +177,7 @@ case "${1}" in
if Find_files config/chroot_local-packages/*.deb if Find_files config/chroot_local-packages/*.deb
then then
# Ensure local packages are not re-installed during lh_binary # Ensure local packages are not replaced.
echo >> chroot/etc/apt/preferences echo >> chroot/etc/apt/preferences
echo "Package: *" >> chroot/etc/apt/preferences echo "Package: *" >> chroot/etc/apt/preferences
echo "Pin: release o=chroot_local-packages" >> chroot/etc/apt/preferences echo "Pin: release o=chroot_local-packages" >> chroot/etc/apt/preferences