josch/mmdebstrap
2
3
Fork 6
Code Issues 8 Pull requests 1 Projects Releases Wiki Activity

don't unset environment variables in @chrootcmd so that hooks still have access to them

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2019-02-15 11:40:06 +01:00
parent 3f15f66892
commit 5115ca87c3
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mmdebstrap
View file

@ -1383,7 +1383,7 @@ sub setup {
# make sure that APT_CONFIG is not set when executing anything inside the # make sure that APT_CONFIG is not set when executing anything inside the
# chroot # chroot
my @chrootcmd = ('env', '--unset=APT_CONFIG', '--unset=TMPDIR'); my @chrootcmd = ();
if ($options->{mode} eq 'proot') { if ($options->{mode} eq 'proot') {
push @chrootcmd, ( push @chrootcmd, (
'proot', 'proot',
@ -1468,7 +1468,8 @@ sub setup {
# And the --predep-package option is broken: #539133 # And the --predep-package option is broken: #539133
info "installing packages..."; info "installing packages...";
run_dpkg_progress({ run_dpkg_progress({
ARGV => [@chrootcmd, 'dpkg', '--install', '--force-depends'], ARGV => [@chrootcmd, 'env', '--unset=TMPDIR',
'dpkg', '--install', '--force-depends'],
PKGS => \@essential_pkgs, PKGS => \@essential_pkgs,
}); });
@ -1483,7 +1484,8 @@ sub setup {
# packages even though they are already installed # packages even though they are already installed
info "re-installing packages because of path-exclude..."; info "re-installing packages because of path-exclude...";
run_dpkg_progress({ run_dpkg_progress({
ARGV => [@chrootcmd, 'dpkg', '--install', '--force-depends'], ARGV => [@chrootcmd, 'env', '--unset=TMPDIR',
'dpkg', '--install', '--force-depends'],
PKGS => \@essential_pkgs, PKGS => \@essential_pkgs,
}); });
} }
@ -1562,7 +1564,8 @@ sub setup {
# into account and thus doesn't install them in the right order # into account and thus doesn't install them in the right order
info 'installing ' . (join ', ', keys %pkgs_to_install_from_outside) . "..."; info 'installing ' . (join ', ', keys %pkgs_to_install_from_outside) . "...";
run_dpkg_progress({ run_dpkg_progress({
ARGV => [@chrootcmd, 'dpkg', '--install', '--force-depends'], ARGV => [@chrootcmd, 'env', '--unset=TMPDIR',
'dpkg', '--install', '--force-depends'],
PKGS => \@debs_to_install, PKGS => \@debs_to_install,
}); });
foreach my $deb (@debs_to_install) { foreach my $deb (@debs_to_install) {
@ -1573,7 +1576,10 @@ sub setup {
run_chroot { run_chroot {
info "installing remaining packages inside the chroot..."; info "installing remaining packages inside the chroot...";
run_apt_progress({ run_apt_progress({
ARGV => [@chrootcmd, 'apt-get', '--yes', 'install'], ARGV => [@chrootcmd, 'env',
'--unset=APT_CONFIG',
'--unset=TMPDIR',
'apt-get', '--yes', 'install'],
PKGS => [keys %pkgs_to_install], PKGS => [keys %pkgs_to_install],
}); });
} $options; } $options;