diff options
| -rwxr-xr-x | helpers/lh_chroot_install-packages | 18 | ||||
| -rwxr-xr-x | helpers/lh_chroot_sources | 2 |
2 files changed, 17 insertions, 3 deletions
diff --git a/helpers/lh_chroot_install-packages b/helpers/lh_chroot_install-packages index 469d0a23a..169510b57 100755 --- a/helpers/lh_chroot_install-packages +++ b/helpers/lh_chroot_install-packages @@ -47,18 +47,32 @@ then # Restoring cache Restore_cache cache/packages_chroot + # Ensure chroot_local-packages override all other packages + if [ -e chroot/etc/apt/preferences ] + then + cp chroot/etc/apt/preferences chroot/etc/apt/preferences.live + fi + + cat >> chroot/etc/apt/preferences.live <<EOF +Package: * +Pin: release o=chroot_local-packages +Pin-Priority: 1001 +EOF + # Installing packages case "${LH_APT}" in apt|apt-get) - Chroot "xargs --arg-file=/root/chroot_packages apt-get ${APT_OPTIONS} install" + Chroot "xargs --arg-file=/root/chroot_packages apt-get ${APT_OPTIONS} -o Dir::Etc::preferences=preferences.live install" ;; aptitude) - Chroot "xargs --arg-file=/root/chroot_packages aptitude ${APTITUDE_OPTIONS} install" + Chroot "xargs --arg-file=/root/chroot_packages aptitude ${APTITUDE_OPTIONS} -o Dir::Etc::preferences=preferences.live install" ;; esac + # Tidying up rm -f chroot/root/chroot_packages + rm -f chroot/etc/apt/preferences.live # Saving cache Save_cache cache/packages_chroot diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources index 9da2c0d3f..3d69cd6e1 100755 --- a/helpers/lh_chroot_sources +++ b/helpers/lh_chroot_sources @@ -120,7 +120,7 @@ case "${1}" in then # Generate Release echo "cd /root/local-packages && apt-ftparchive \ - -o APT::FTPArchive::Release::Label=local-packages \ + -o APT::FTPArchive::Release::Origin=chroot_local-packages \ release . > Release" | Chroot sh _LH_DOTGNUPG_EXISTED=0 |