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

use warning() instead of warn() when unmounting /sys and /proc fails

Browse source
This commit is contained in:
Johannes Schauer Marin Rodrigues 2022-05-28 12:52:36 +02:00
parent a238d90774
commit e71676e15c
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
mmdebstrap
View file

@ -1072,7 +1072,7 @@ sub run_chroot {
} }
push @cleanup_tasks, sub { push @cleanup_tasks, sub {
unlink "$options->{root}/dev/$fname" unlink "$options->{root}/dev/$fname"
or warn "cannot unlink ./dev/$fname: $!"; or warning("cannot unlink ./dev/$fname: $!");
}; };
symlink $linkname, "$options->{root}/dev/$fname" symlink $linkname, "$options->{root}/dev/$fname"
or error or error
@ -1114,9 +1114,9 @@ sub run_chroot {
push @cleanup_tasks, sub { push @cleanup_tasks, sub {
0 == system('umount', @umountopts, 0 == system('umount', @umountopts,
"$options->{root}/dev/$fname") "$options->{root}/dev/$fname")
or warn "umount ./dev/$fname failed: $?"; or warning("umount ./dev/$fname failed: $?");
unlink "$options->{root}/dev/$fname" unlink "$options->{root}/dev/$fname"
or warn "cannot unlink ./dev/$fname: $!"; or warning("cannot unlink ./dev/$fname: $!");
}; };
0 == system('mount', '-o', 'bind', "/dev/$fname", 0 == system('mount', '-o', 'bind', "/dev/$fname",
"$options->{root}/dev/$fname") "$options->{root}/dev/$fname")
@ -1150,7 +1150,7 @@ sub run_chroot {
# was already created in the run_setup function. # was already created in the run_setup function.
push @cleanup_tasks, sub { push @cleanup_tasks, sub {
rmdir "$options->{root}/dev/$fname" rmdir "$options->{root}/dev/$fname"
or warn "cannot rmdir ./dev/$fname: $!"; or warning("cannot rmdir ./dev/$fname: $!");
}; };
if (-e "$options->{root}/dev/$fname") { if (-e "$options->{root}/dev/$fname") {
if (!-d "$options->{root}/dev/$fname") { if (!-d "$options->{root}/dev/$fname") {
@ -1185,7 +1185,7 @@ sub run_chroot {
push @cleanup_tasks, sub { push @cleanup_tasks, sub {
0 == system('umount', @umountopts, 0 == system('umount', @umountopts,
"$options->{root}/dev/$fname") "$options->{root}/dev/$fname")
or warn "umount ./dev/$fname failed: $?"; or warning("umount ./dev/$fname failed: $?");
}; };
0 == system('mount', '-o', 'bind', "/dev/$fname", 0 == system('mount', '-o', 'bind', "/dev/$fname",
"$options->{root}/dev/$fname") "$options->{root}/dev/$fname")
@ -1236,7 +1236,7 @@ sub run_chroot {
) { ) {
push @cleanup_tasks, sub { push @cleanup_tasks, sub {
0 == system('umount', "$options->{root}/sys") 0 == system('umount', "$options->{root}/sys")
or warn "umount /sys failed: $?"; or warning("umount /sys failed: $?");
}; };
} elsif ( } elsif (
0 == system('mount', '-o', 'rbind', '/sys', 0 == system('mount', '-o', 'rbind', '/sys',
@ -1247,7 +1247,7 @@ sub run_chroot {
0 == system( 0 == system(
'umount', '--no-mtab', 'umount', '--no-mtab',
'--lazy', "$options->{root}/sys" '--lazy', "$options->{root}/sys"
) or warn "umount /sys failed: $?"; ) or warning("umount /sys failed: $?");
}; };
} else { } else {
error "mount /sys failed: $?"; error "mount /sys failed: $?";
@ -1263,7 +1263,7 @@ sub run_chroot {
# unmounting /sys only seems to be successful with --lazy # unmounting /sys only seems to be successful with --lazy
0 == system('umount', '--no-mtab', '--lazy', 0 == system('umount', '--no-mtab', '--lazy',
"$options->{root}/sys") "$options->{root}/sys")
or warn "umount /sys failed: $?"; or warning("umount /sys failed: $?");
}; };
# without the network namespace unshared, we cannot mount a new # without the network namespace unshared, we cannot mount a new
# sysfs. Since we need network, we just bind-mount. # sysfs. Since we need network, we just bind-mount.
@ -1317,11 +1317,11 @@ sub run_chroot {
) { ) {
0 == system('umount', 0 == system('umount',
"$options->{root}/proc/sys/fs/binfmt_misc") "$options->{root}/proc/sys/fs/binfmt_misc")
or error or warning(
"umount /proc/sys/fs/binfmt_misc failed: $?"; "umount /proc/sys/fs/binfmt_misc failed: $?");
} }
0 == system('umount', "$options->{root}/proc") 0 == system('umount', "$options->{root}/proc")
or error "umount /proc failed: $?"; or warning("umount /proc failed: $?");
}; };
} elsif ( } elsif (
0 == system('mount', '-t', 'proc', 'proc', 0 == system('mount', '-t', 'proc', 'proc',
@ -1329,7 +1329,7 @@ sub run_chroot {
push @cleanup_tasks, sub { push @cleanup_tasks, sub {
# since we cannot write to /etc/mtab we need --no-mtab # since we cannot write to /etc/mtab we need --no-mtab
0 == system('umount', '--no-mtab', "$options->{root}/proc") 0 == system('umount', '--no-mtab', "$options->{root}/proc")
or error "umount /proc failed: $?"; or warning("umount /proc failed: $?");
}; };
} else { } else {
error "mount /proc failed: $?"; error "mount /proc failed: $?";
@ -1343,7 +1343,7 @@ sub run_chroot {
push @cleanup_tasks, sub { push @cleanup_tasks, sub {
# since we cannot write to /etc/mtab we need --no-mtab # since we cannot write to /etc/mtab we need --no-mtab
0 == system('umount', '--no-mtab', "$options->{root}/proc") 0 == system('umount', '--no-mtab', "$options->{root}/proc")
or error "umount /proc failed: $?"; or warning("umount /proc failed: $?");
}; };
0 == system('mount', '-t', 'proc', 'proc', "$options->{root}/proc") 0 == system('mount', '-t', 'proc', 'proc', "$options->{root}/proc")
or error "mount /proc failed: $?"; or error "mount /proc failed: $?";