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

instead of touching a file, test if /var/lib/apt/lists/partial is readable to decide about apt sandboxing

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2019-03-01 01:05:27 +01:00
parent ed1899476c
commit 52b1a9dc6e
Signed by untrusted user: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mmdebstrap
View file

@ -1106,14 +1106,12 @@ sub setup {
# not have permissions to read the root directory. In that case, we have # not have permissions to read the root directory. In that case, we have
# to disable apt sandboxing. # to disable apt sandboxing.
if ($options->{mode} eq 'root') { if ($options->{mode} eq 'root') {
my $dummy = '/var/lib/apt/lists/partial/dummy'; my $partial = '/var/lib/apt/lists/partial';
if (system('/usr/lib/apt/apt-helper', 'drop-privs', 'touch', "$options->{root}$dummy") != 0) { if (system('/usr/lib/apt/apt-helper', 'drop-privs', '--', 'test', '-r', "$options->{root}$partial") != 0) {
warning "Download is performed unsandboxed as root as file $options->{root}$dummy couldn't be accessed by user _apt"; warning "Download is performed unsandboxed as root as file $options->{root}$partial couldn't be accessed by user _apt";
open my $fh, '>>', $tmpfile or error "cannot open $tmpfile for appending: $!"; open my $fh, '>>', $tmpfile or error "cannot open $tmpfile for appending: $!";
print $fh "APT::Sandbox::User \"root\";\n"; print $fh "APT::Sandbox::User \"root\";\n";
close $fh; close $fh;
} else {
unlink "$options->{root}$dummy" or error "unable to unlink $options->{root}$dummy: $!";
} }
} }