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

Removing some code in chroot_apt helper that left over the preferences files in the final image.

This commit is contained in:
Daniel Baumann 2009-04-09 14:40:36 +02:00
parent 39876e86b9
commit 40988d5de3
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
helpers/lh_binary
View File

@ -88,6 +88,7 @@ then
lh_chroot_hosts remove ${*} lh_chroot_hosts remove ${*}
fi fi
lh_chroot_apt remove ${*}
lh_chroot_sysfs remove ${*} lh_chroot_sysfs remove ${*}
lh_chroot_selinuxfs remove ${*} lh_chroot_selinuxfs remove ${*}
lh_chroot_proc remove ${*} lh_chroot_proc remove ${*}

15
helpers/lh_chroot_apt
View File

@ -207,21 +207,6 @@ case "${1}" in
rm -f chroot/etc/apt/preferences rm -f chroot/etc/apt/preferences
fi fi
if Find_files config/chroot_local-packages/*.deb
then
# Ensure local packages are not replaced.
echo >> chroot/etc/apt/preferences
echo "# Added by lh_chroot_apt ${@}" >> chroot/etc/apt/preferences
echo "Package: *" >> chroot/etc/apt/preferences
echo "Pin: release o=chroot_local-packages" >> chroot/etc/apt/preferences
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
fi
# Removing stage file # Removing stage file
rm -f .stage/chroot_apt rm -f .stage/chroot_apt
;; ;;