zulcss/mmdebstrap
1
0
Fork 0
forked from josch/mmdebstrap
Code Pull requests Activity

rmdir /var/lib/apt/lists/auxfiles which is created by apt >= 1.6 but unknown to older apt inside the chroot

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2018-09-23 19:45:09 +02:00
parent 4d75cb8b89
commit 60f047ba66
Signed by untrusted user: josch
GPG key ID: F2CBA5C78FBD83E1
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mmdebstrap
View file

@ -973,6 +973,9 @@ sub setup {
# clean up temporary configuration file # clean up temporary configuration file
unlink "$options->{root}/etc/apt/apt.conf.d/00mmdebstrap" or die "failed to unlink /etc/apt/apt.conf.d/00mmdebstrap: $!"; unlink "$options->{root}/etc/apt/apt.conf.d/00mmdebstrap" or die "failed to unlink /etc/apt/apt.conf.d/00mmdebstrap: $!";
# apt since 1.6 creates the auxfiles directory. If apt inside the chroot
# is older than that, then it will not know how to clean it.
rmdir "$options->{root}/var/lib/apt/lists/auxfiles" or die "cannot rmdir /var/lib/apt/lists/auxfiles: $!";
# if there is no apt inside the chroot, clean it from the outside # if there is no apt inside the chroot, clean it from the outside
if ($options->{variant} eq 'essential') { if ($options->{variant} eq 'essential') {
$ENV{"APT_CONFIG"} = "$tmpfile"; $ENV{"APT_CONFIG"} = "$tmpfile";

3
test.sh
View file

@ -108,7 +108,10 @@ for dist in stable testing unstable; do
diff -u status1 status2 diff -u status1 status2
rm status1 status2 rm status1 status2
sudo rm debian-$dist-debootstrap/var/lib/dpkg/status debian-$dist-mm/var/lib/dpkg/status sudo rm debian-$dist-debootstrap/var/lib/dpkg/status debian-$dist-mm/var/lib/dpkg/status
# this file is only created by apt 1.6 or newer
if [ "$dist" != "stable" ]; then
sudo rmdir debian-$dist-mm/var/lib/apt/lists/auxfiles sudo rmdir debian-$dist-mm/var/lib/apt/lists/auxfiles
fi
# debootstrap exposes the hosts's kernel version # debootstrap exposes the hosts's kernel version
sudo rm debian-$dist-debootstrap/etc/apt/apt.conf.d/01autoremove-kernels \ sudo rm debian-$dist-debootstrap/etc/apt/apt.conf.d/01autoremove-kernels \
debian-$dist-mm/etc/apt/apt.conf.d/01autoremove-kernels debian-$dist-mm/etc/apt/apt.conf.d/01autoremove-kernels