diff options
Diffstat (limited to 'helpers')
| -rwxr-xr-x | helpers/lh_binary | 1 | ||||
| -rwxr-xr-x | helpers/lh_chroot_apt | 23 |
2 files changed, 20 insertions, 4 deletions
diff --git a/helpers/lh_binary b/helpers/lh_binary index 090d32e48..48087c03a 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 1e6ab563f..8564bf4d2 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 |