forked from josch/mmdebstrap
refactor worker function to remove code duplication
Thanks: Guillem Jover <guillem@debian.org>
This commit is contained in:
parent
d244f4f1de
commit
113532b3e1
GPG key ID:
F2CBA5C78FBD83E1
1 changed files with 96 additions and 154 deletions
112
mmdebstrap
112
mmdebstrap
|
|
@ -5963,8 +5963,6 @@ sub main() {
|
||||||
my $sigset = POSIX::SigSet->new(SIGINT, SIGHUP, SIGPIPE, SIGTERM);
|
my $sigset = POSIX::SigSet->new(SIGINT, SIGHUP, SIGPIPE, SIGTERM);
|
||||||
POSIX::sigprocmask(SIG_BLOCK, $sigset) or error "Can't block signals: $!";
|
POSIX::sigprocmask(SIG_BLOCK, $sigset) or error "Can't block signals: $!";
|
||||||
|
|
||||||
my $pid;
|
|
||||||
|
|
||||||
# a pipe to transfer the final tarball from the child to the parent
|
# a pipe to transfer the final tarball from the child to the parent
|
||||||
pipe my $rfh, my $wfh;
|
pipe my $rfh, my $wfh;
|
||||||
|
|
||||||
|
|
@ -5979,9 +5977,8 @@ sub main() {
|
||||||
# b) it puts code writing the protocol outside of the helper/listener
|
# b) it puts code writing the protocol outside of the helper/listener
|
||||||
# c) the forked listener process cannot communicate to its parent
|
# c) the forked listener process cannot communicate to its parent
|
||||||
pipe my $nblkreader, my $nblkwriter or error "pipe failed: $!";
|
pipe my $nblkreader, my $nblkwriter or error "pipe failed: $!";
|
||||||
if ($options->{mode} eq 'unshare') {
|
|
||||||
$pid = get_unshare_cmd(
|
my $worker = sub {
|
||||||
sub {
|
|
||||||
# child
|
# child
|
||||||
local $SIG{'INT'} = 'DEFAULT';
|
local $SIG{'INT'} = 'DEFAULT';
|
||||||
local $SIG{'HUP'} = 'DEFAULT';
|
local $SIG{'HUP'} = 'DEFAULT';
|
||||||
|
|
@ -6013,8 +6010,8 @@ sub main() {
|
||||||
|
|
||||||
if ($options->{dryrun}) {
|
if ($options->{dryrun}) {
|
||||||
info "simulate creating tarball...";
|
info "simulate creating tarball...";
|
||||||
} elsif (any { $_ eq $options->{format} }
|
} elsif (any { $_ eq $options->{format} } ('tar', 'squashfs', 'ext2'))
|
||||||
('tar', 'squashfs', 'ext2')) {
|
{
|
||||||
info "creating tarball...";
|
info "creating tarball...";
|
||||||
|
|
||||||
# redirect tar output to the writing end of the pipe so
|
# redirect tar output to the writing end of the pipe so
|
||||||
|
|
@ -6030,92 +6027,27 @@ sub main() {
|
||||||
print $devtar;
|
print $devtar;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($options->{mode} eq 'unshare') {
|
||||||
# pack everything except ./dev
|
# pack everything except ./dev
|
||||||
0 == system('tar', @taropts, '-C', $options->{root}, '.')
|
0 == system('tar', @taropts, '-C', $options->{root}, '.')
|
||||||
or error "tar failed: $?";
|
or error "tar failed: $?";
|
||||||
|
} elsif ($options->{mode} eq 'fakechroot') {
|
||||||
info "done";
|
# By default, FAKECHROOT_EXCLUDE_PATH includes /proc and /sys
|
||||||
} elsif (any { $_ eq $options->{format} }
|
# which means that the resulting tarball will contain the
|
||||||
('directory', 'null')) {
|
# permission and ownership information of /proc and /sys from
|
||||||
# nothing to do
|
# the outside, which we want to avoid.
|
||||||
} else {
|
|
||||||
error "unknown format: $options->{format}";
|
|
||||||
}
|
|
||||||
|
|
||||||
exit 0;
|
|
||||||
},
|
|
||||||
\@idmap
|
|
||||||
);
|
|
||||||
} elsif (any { $_ eq $options->{mode} }
|
|
||||||
('root', 'fakechroot', 'chrootless')) {
|
|
||||||
$pid = fork() // error "fork() failed: $!";
|
|
||||||
if ($pid == 0) {
|
|
||||||
local $SIG{'INT'} = 'DEFAULT';
|
|
||||||
local $SIG{'HUP'} = 'DEFAULT';
|
|
||||||
local $SIG{'PIPE'} = 'DEFAULT';
|
|
||||||
local $SIG{'TERM'} = 'DEFAULT';
|
|
||||||
|
|
||||||
# unblock all delayed signals (and possibly handle them)
|
|
||||||
POSIX::sigprocmask(SIG_UNBLOCK, $sigset)
|
|
||||||
or error "Can't unblock signals: $!";
|
|
||||||
|
|
||||||
close $rfh;
|
|
||||||
close $parentsock;
|
|
||||||
open(STDOUT, '>&', STDERR) or error "cannot open STDOUT: $!";
|
|
||||||
|
|
||||||
setup($options);
|
|
||||||
|
|
||||||
print $childsock (pack('n', 0) . 'adios');
|
|
||||||
$childsock->flush();
|
|
||||||
|
|
||||||
close $childsock;
|
|
||||||
|
|
||||||
close $nblkreader;
|
|
||||||
if (!$options->{dryrun} && $options->{format} eq 'ext2') {
|
|
||||||
my $numblocks = approx_disk_usage($options->{root});
|
|
||||||
print $nblkwriter $numblocks;
|
|
||||||
$nblkwriter->flush();
|
|
||||||
}
|
|
||||||
close $nblkwriter;
|
|
||||||
|
|
||||||
if ($options->{dryrun}) {
|
|
||||||
info "simulate creating tarball...";
|
|
||||||
} elsif (any { $_ eq $options->{format} }
|
|
||||||
('tar', 'squashfs', 'ext2')) {
|
|
||||||
info "creating tarball...";
|
|
||||||
|
|
||||||
# redirect tar output to the writing end of the pipe so that
|
|
||||||
# the parent process can capture the output
|
|
||||||
open(STDOUT, '>&', $wfh) or error "cannot open STDOUT: $!";
|
|
||||||
|
|
||||||
# Add ./dev as the first entries of the tar file.
|
|
||||||
# We cannot add them after calling tar, because there is no way
|
|
||||||
# to prevent tar from writing NULL entries at the end.
|
|
||||||
if (any { $_ eq 'output/dev' } @{ $options->{skip} }) {
|
|
||||||
info "skipping output/dev as requested";
|
|
||||||
} else {
|
|
||||||
print $devtar;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($options->{mode} eq 'fakechroot') {
|
|
||||||
# By default, FAKECHROOT_EXCLUDE_PATH includes /proc and
|
|
||||||
# /sys which means that the resulting tarball will contain
|
|
||||||
# the permission and ownership information of /proc and
|
|
||||||
# /sys from the outside, which we want to avoid.
|
|
||||||
## no critic (Variables::RequireLocalizedPunctuationVars)
|
## no critic (Variables::RequireLocalizedPunctuationVars)
|
||||||
$ENV{FAKECHROOT_EXCLUDE_PATH} = "/dev";
|
$ENV{FAKECHROOT_EXCLUDE_PATH} = "/dev";
|
||||||
# Fakechroot requires tar to run inside the chroot or
|
# Fakechroot requires tar to run inside the chroot or otherwise
|
||||||
# otherwise absolute symlinks will include the path to the
|
# absolute symlinks will include the path to the root directory
|
||||||
# root directory
|
|
||||||
0 == system('chroot', $options->{root}, 'tar',
|
0 == system('chroot', $options->{root}, 'tar',
|
||||||
@taropts, '-C', '/', '.')
|
@taropts, '-C', '/', '.')
|
||||||
or error "tar failed: $?";
|
or error "tar failed: $?";
|
||||||
} elsif (any { $_ eq $options->{mode} } ('root', 'chrootless'))
|
} elsif (any { $_ eq $options->{mode} } ('root', 'chrootless')) {
|
||||||
{
|
# If the chroot directory is not owned by the root user, then
|
||||||
# If the chroot directory is not owned by the root user,
|
# we assume that no measure was taken to fake root permissions.
|
||||||
# then we assume that no measure was taken to fake root
|
# Since the final tarball should contain entries with root
|
||||||
# permissions. Since the final tarball should contain
|
# ownership, we instruct tar to do so.
|
||||||
# entries with root ownership, we instruct tar to do so.
|
|
||||||
my @owneropts = ();
|
my @owneropts = ();
|
||||||
if ((stat $options->{root})[4] != 0) {
|
if ((stat $options->{root})[4] != 0) {
|
||||||
push @owneropts, '--owner=0', '--group=0',
|
push @owneropts, '--owner=0', '--group=0',
|
||||||
|
|
@ -6136,6 +6068,16 @@ sub main() {
|
||||||
}
|
}
|
||||||
|
|
||||||
exit 0;
|
exit 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
my $pid;
|
||||||
|
if ($options->{mode} eq 'unshare') {
|
||||||
|
$pid = get_unshare_cmd($worker, \@idmap);
|
||||||
|
} elsif (any { $_ eq $options->{mode} }
|
||||||
|
('root', 'fakechroot', 'chrootless')) {
|
||||||
|
$pid = fork() // error "fork() failed: $!";
|
||||||
|
if ($pid == 0) {
|
||||||
|
$worker->();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
error "unknown mode: $options->{mode}";
|
error "unknown mode: $options->{mode}";
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue