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

rewrite comments so that they fit into 79 characters

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2020-01-08 16:23:34 +01:00
parent 27bd6df320
commit 2782d14348
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 106 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

194
mmdebstrap
View file

@ -383,26 +383,27 @@ sub get_unshare_cmd(&$) {
# we don't want to unshare the parent process # we don't want to unshare the parent process
my $gcpid = fork() // error "fork() failed: $!"; my $gcpid = fork() // error "fork() failed: $!";
if ($gcpid == 0) { if ($gcpid == 0) {
# Create a pipe for the parent process to signal the child process that it is # Create a pipe for the parent process to signal the child process that
# done with calling unshare() so that the child can go ahead setting up # it is done with calling unshare() so that the child can go ahead
# uid_map and gid_map. # setting up uid_map and gid_map.
pipe my $rfh, my $wfh; pipe my $rfh, my $wfh;
# We have to do this dance with forking a process and then modifying
# We have to do this dance with forking a process and then modifying the # the parent from the child because:
# parent from the child because: # - new[ug]idmap can only be called on a process id after that process
# - new[ug]idmap can only be called on a process id after that process has # has unshared the user namespace
# unshared the user namespace # - a process looses its capabilities if it performs an execve() with
# - a process looses its capabilities if it performs an execve() with nonzero # nonzero user ids see the capabilities(7) man page for details.
# user ids see the capabilities(7) man page for details. # - a process that unshared the user namespace by default does not
# - a process that unshared the user namespace by default does not have the # have the privileges to call new[ug]idmap on itself
# privileges to call new[ug]idmap on itself
# #
# this also works the other way around (the child setting up a user namespace # this also works the other way around (the child setting up a user
# and being modified from the parent) but that way, the parent would have to # namespace and being modified from the parent) but that way, the
# stay around until the child exited (so a pid would be wasted). Additionally, # parent would have to stay around until the child exited (so a pid
# that variant would require an additional pipe to let the parent signal the # would be wasted). Additionally, that variant would require an
# child that it is done with calling new[ug]idmap. The way it is done here, # additional pipe to let the parent signal the child that it is done
# this signaling can instead be done by wait()-ing for the exit of the child. # with calling new[ug]idmap. The way it is done here, this signaling
# can instead be done by wait()-ing for the exit of the child.
my $ppid = $$; my $ppid = $$;
my $cpid = fork() // error "fork() failed: $!"; my $cpid = fork() // error "fork() failed: $!";
if ($cpid == 0) { if ($cpid == 0) {
@ -764,7 +765,8 @@ sub run_chroot(&$) {
eval { eval {
if (any { $_ eq $options->{mode} } ('root', 'unshare')) { if (any { $_ eq $options->{mode} } ('root', 'unshare')) {
# if more than essential should be installed, make the system look # if more than essential should be installed, make the system look
# more like a real one by creating or bind-mounting the device nodes # more like a real one by creating or bind-mounting the device
# nodes
foreach my $file (@devfiles) { foreach my $file (@devfiles) {
my ($fname, $mode, $type, $linkname, $devmajor, $devminor) = @{$file}; my ($fname, $mode, $type, $linkname, $devmajor, $devminor) = @{$file};
next if $fname eq './dev/'; next if $fname eq './dev/';
@ -785,7 +787,8 @@ sub run_chroot(&$) {
} }
symlink $linkname, "$options->{root}/$fname" or error "cannot create symlink $fname"; symlink $linkname, "$options->{root}/$fname" or error "cannot create symlink $fname";
} }
} elsif ($type == 3 or $type == 4) { # character/block special } elsif ($type == 3 or $type == 4) {
# character/block special
if (!$options->{havemknod}) { if (!$options->{havemknod}) {
open my $fh, '>', "$options->{root}/$fname" or error "cannot open $options->{root}/$fname: $!"; open my $fh, '>', "$options->{root}/$fname" or error "cannot open $options->{root}/$fname: $!";
close $fh; close $fh;
@ -843,7 +846,8 @@ sub run_chroot(&$) {
} }
} elsif (any { $_ eq $options->{mode} } ('proot', 'fakechroot', 'chrootless')) { } elsif (any { $_ eq $options->{mode} } ('proot', 'fakechroot', 'chrootless')) {
# we cannot mount in fakechroot and proot mode # we cannot mount in fakechroot and proot mode
# in proot mode we have /dev bind-mounted already through --bind=/dev # in proot mode we have /dev bind-mounted already through
# --bind=/dev
} else { } else {
error "unknown mode: $options->{mode}"; error "unknown mode: $options->{mode}";
} }
@ -856,11 +860,11 @@ sub run_chroot(&$) {
}; };
0 == system('mount', '-t', 'sysfs', '-o', 'nosuid,nodev,noexec', 'sys', "$options->{root}/sys") or error "mount /sys failed: $?"; 0 == system('mount', '-t', 'sysfs', '-o', 'nosuid,nodev,noexec', 'sys', "$options->{root}/sys") or error "mount /sys failed: $?";
} elsif ($options->{mode} eq 'unshare') { } elsif ($options->{mode} eq 'unshare') {
# naturally we have to clean up after ourselves in sudo mode where we # naturally we have to clean up after ourselves in sudo mode where
# do a real mount. But we also need to unmount in unshare mode because # we do a real mount. But we also need to unmount in unshare mode
# otherwise, even with the --one-file-system tar option, the # because otherwise, even with the --one-file-system tar option,
# permissions of the mount source will be stored and not the mount # the permissions of the mount source will be stored and not the
# target (the directory) # mount target (the directory)
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
# unmounting /sys only seems to be successful with --lazy # unmounting /sys only seems to be successful with --lazy
@ -874,7 +878,8 @@ sub run_chroot(&$) {
0 == system('mount', '-o', 'rbind', '/sys', "$options->{root}/sys") or error "mount /sys failed: $?"; 0 == system('mount', '-o', 'rbind', '/sys', "$options->{root}/sys") or error "mount /sys failed: $?";
} elsif (any { $_ eq $options->{mode} } ('proot', 'fakechroot', 'chrootless')) { } elsif (any { $_ eq $options->{mode} } ('proot', 'fakechroot', 'chrootless')) {
# we cannot mount in fakechroot and proot mode # we cannot mount in fakechroot and proot mode
# in proot mode we have /proc bind-mounted already through --bind=/proc # in proot mode we have /proc bind-mounted already through
# --bind=/proc
} else { } else {
error "unknown mode: $options->{mode}"; error "unknown mode: $options->{mode}";
} }
@ -889,11 +894,11 @@ sub run_chroot(&$) {
}; };
0 == system('mount', '-t', 'proc', 'proc', "$options->{root}/proc") or error "mount /proc failed: $?"; 0 == system('mount', '-t', 'proc', 'proc', "$options->{root}/proc") or error "mount /proc failed: $?";
} elsif ($options->{mode} eq 'unshare') { } elsif ($options->{mode} eq 'unshare') {
# naturally we have to clean up after ourselves in sudo mode where we # naturally we have to clean up after ourselves in sudo mode where
# do a real mount. But we also need to unmount in unshare mode because # we do a real mount. But we also need to unmount in unshare mode
# otherwise, even with the --one-file-system tar option, the # because otherwise, even with the --one-file-system tar option,
# permissions of the mount source will be stored and not the mount # the permissions of the mount source will be stored and not the
# target (the directory) # mount target (the directory)
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") or error "umount /proc failed: $?"; 0 == system('umount', '--no-mtab', "$options->{root}/proc") or error "umount /proc failed: $?";
@ -901,7 +906,8 @@ sub run_chroot(&$) {
0 == system('mount', '-t', 'proc', 'proc', "$options->{root}/proc") or error "mount /proc failed: $?"; 0 == system('mount', '-t', 'proc', 'proc', "$options->{root}/proc") or error "mount /proc failed: $?";
} elsif (any { $_ eq $options->{mode} } ('proot', 'fakechroot', 'chrootless')) { } elsif (any { $_ eq $options->{mode} } ('proot', 'fakechroot', 'chrootless')) {
# we cannot mount in fakechroot and proot mode # we cannot mount in fakechroot and proot mode
# in proot mode we have /sys bind-mounted already through --bind=/sys # in proot mode we have /sys bind-mounted already through
# --bind=/sys
} else { } else {
error "unknown mode: $options->{mode}"; error "unknown mode: $options->{mode}";
} }
@ -1186,8 +1192,10 @@ sub setup {
## setup merged usr ## setup merged usr
#my @amd64_dirs = ('lib32', 'lib64', 'libx32'); # only amd64 for now #my @amd64_dirs = ('lib32', 'lib64', 'libx32'); # only amd64 for now
#foreach my $dir ("bin", "sbin", "lib", @amd64_dirs) { #foreach my $dir ("bin", "sbin", "lib", @amd64_dirs) {
# symlink "usr/$dir", "$options->{root}/$dir" or die "cannot create symlink: $!"; # symlink "usr/$dir", "$options->{root}/$dir"
# make_path("$options->{root}/usr/$dir") or die "cannot create /usr/$dir: $!"; # or die "cannot create symlink: $!";
# make_path("$options->{root}/usr/$dir")
# or die "cannot create /usr/$dir: $!";
#} #}
{ {
@ -1397,7 +1405,8 @@ sub setup {
# essential packages # essential packages
} elsif (any { $_ eq $options->{variant} } ('standard', 'important', 'required', 'buildd', 'minbase')) { } elsif (any { $_ eq $options->{variant} } ('standard', 'important', 'required', 'buildd', 'minbase')) {
if ($prio eq 'optional' or $prio eq 'extra') { if ($prio eq 'optional' or $prio eq 'extra') {
# always ignore packages of priority optional and extra # always ignore packages of priority optional and
# extra
} elsif ($prio eq 'standard') { } elsif ($prio eq 'standard') {
if (none { $_ eq $options->{variant} } ('important', 'required', 'buildd', 'minbase')) { if (none { $_ eq $options->{variant} } ('important', 'required', 'buildd', 'minbase')) {
push @pkgs_to_install, $pkgname; push @pkgs_to_install, $pkgname;
@ -1569,7 +1578,8 @@ sub setup {
} elsif (any { $_ eq $options->{variant} } ('custom', 'essential', 'apt', 'standard', 'important', 'required', 'buildd', 'minbase')) { } elsif (any { $_ eq $options->{variant} } ('custom', 'essential', 'apt', 'standard', 'important', 'required', 'buildd', 'minbase')) {
if ($options->{mode} eq 'fakechroot') { if ($options->{mode} eq 'fakechroot') {
# this borrows from and extends # this borrows from and extends
# /etc/fakechroot/debootstrap.env and /etc/fakechroot/chroot.env # /etc/fakechroot/debootstrap.env and
# /etc/fakechroot/chroot.env
{ {
my @fakechrootsubst = (); my @fakechrootsubst = ();
foreach my $dir ('/usr/sbin', '/usr/bin', '/sbin', '/bin') { foreach my $dir ('/usr/sbin', '/usr/bin', '/sbin', '/bin') {
@ -1625,8 +1635,8 @@ 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
# chroot # inside the chroot
my @chrootcmd = (); my @chrootcmd = ();
if ($options->{mode} eq 'proot') { if ($options->{mode} eq 'proot') {
push @chrootcmd, ( push @chrootcmd, (
@ -1643,21 +1653,22 @@ sub setup {
error "unknown mode: $options->{mode}"; error "unknown mode: $options->{mode}";
} }
# copy qemu-user-static binary into chroot or setup proot with --qemu # copy qemu-user-static binary into chroot or setup proot with
# --qemu
if (defined $options->{qemu}) { if (defined $options->{qemu}) {
if ($options->{mode} eq 'proot') { if ($options->{mode} eq 'proot') {
push @chrootcmd, "--qemu=qemu-$options->{qemu}"; push @chrootcmd, "--qemu=qemu-$options->{qemu}";
} elsif ($options->{mode} eq 'fakechroot') { } elsif ($options->{mode} eq 'fakechroot') {
# The binfmt support on the outside is used, so qemu needs to know # The binfmt support on the outside is used, so qemu needs
# where it has to look for shared libraries # to know where it has to look for shared libraries
if (defined $ENV{QEMU_LD_PREFIX} if (defined $ENV{QEMU_LD_PREFIX}
&& $ENV{QEMU_LD_PREFIX} ne "") { && $ENV{QEMU_LD_PREFIX} ne "") {
$ENV{QEMU_LD_PREFIX} = "$ENV{QEMU_LD_PREFIX}:$options->{root}"; $ENV{QEMU_LD_PREFIX} = "$ENV{QEMU_LD_PREFIX}:$options->{root}";
} else { } else {
$ENV{QEMU_LD_PREFIX} = $options->{root}; $ENV{QEMU_LD_PREFIX} = $options->{root};
} }
# Make sure that the fakeroot and fakechroot shared libraries # Make sure that the fakeroot and fakechroot shared
# exist for the right architecture # libraries exist for the right architecture
open my $fh, '-|', 'dpkg-architecture', '-a', $options->{nativearch}, '-qDEB_HOST_MULTIARCH' // error "failed to fork(): $!"; open my $fh, '-|', 'dpkg-architecture', '-a', $options->{nativearch}, '-qDEB_HOST_MULTIARCH' // error "failed to fork(): $!";
chomp (my $deb_host_multiarch = do { local $/; <$fh> }); chomp (my $deb_host_multiarch = do { local $/; <$fh> });
close $fh; close $fh;
@ -1672,9 +1683,9 @@ sub setup {
if (! -e "$fakerootdir/libfakeroot-sysv.so") { if (! -e "$fakerootdir/libfakeroot-sysv.so") {
error "$fakerootdir/libfakeroot-sysv.so doesn't exist. Install libfakeroot:$options->{nativearch} outside the chroot"; error "$fakerootdir/libfakeroot-sysv.so doesn't exist. Install libfakeroot:$options->{nativearch} outside the chroot";
} }
# fakechroot only fills LD_LIBRARY_PATH with the directories of # fakechroot only fills LD_LIBRARY_PATH with the
# the host's architecture. We append the directories of the chroot # directories of the host's architecture. We append the
# architecture. # directories of the chroot architecture.
$ENV{LD_LIBRARY_PATH} .= ":$fakechrootdir:$fakerootdir"; $ENV{LD_LIBRARY_PATH} .= ":$fakechrootdir:$fakerootdir";
} elsif (any { $_ eq $options->{mode} } ('root', 'unshare')) { } elsif (any { $_ eq $options->{mode} } ('root', 'unshare')) {
# other modes require a static qemu-user binary # other modes require a static qemu-user binary
@ -1717,8 +1728,8 @@ sub setup {
} }
# install the extracted packages properly # install the extracted packages properly
# we need --force-depends because dpkg does not take Pre-Depends into # we need --force-depends because dpkg does not take Pre-Depends
# account and thus doesn't install them in the right order # into account and thus doesn't install them in the right order
# And the --predep-package option is broken: #539133 # And the --predep-package option is broken: #539133
info "installing packages..."; info "installing packages...";
run_chroot { run_chroot {
@ -1729,8 +1740,8 @@ sub setup {
}); });
} $options; } $options;
# if the path-excluded option was added to the dpkg config, reinstall all # if the path-excluded option was added to the dpkg config,
# packages # reinstall all packages
if (-e "$options->{root}/etc/dpkg/dpkg.cfg.d/99mmdebstrap") { if (-e "$options->{root}/etc/dpkg/dpkg.cfg.d/99mmdebstrap") {
open(my $fh, '<', "$options->{root}/etc/dpkg/dpkg.cfg.d/99mmdebstrap") or error "cannot open /etc/dpkg/dpkg.cfg.d/99mmdebstrap: $!"; open(my $fh, '<', "$options->{root}/etc/dpkg/dpkg.cfg.d/99mmdebstrap") or error "cannot open /etc/dpkg/dpkg.cfg.d/99mmdebstrap: $!";
my $num_matches = grep /^path-exclude=/, <$fh>; my $num_matches = grep /^path-exclude=/, <$fh>;
@ -1757,18 +1768,18 @@ sub setup {
} }
if ($options->{variant} ne 'custom' and scalar @pkgs_to_install > 0) { if ($options->{variant} ne 'custom' and scalar @pkgs_to_install > 0) {
# some packages have to be installed from the outside before anything # some packages have to be installed from the outside before
# can be installed from the inside. # anything can be installed from the inside.
# #
# we do not need to install any *-archive-keyring packages inside the # we do not need to install any *-archive-keyring packages
# chroot prior to installing the packages, because the keyring is only # inside the chroot prior to installing the packages, because
# used when doing "apt-get update" and that was already done at the # the keyring is only used when doing "apt-get update" and that
# beginning using key material from the outside. Since the apt cache # was already done at the beginning using key material from the
# is already filled and we are not calling "apt-get update" again, the # outside. Since the apt cache is already filled and we are not
# keyring can be installed later during installation. But: if it's not # calling "apt-get update" again, the keyring can be installed
# installed during installation, then we might end up with a fully # later during installation. But: if it's not installed during
# installed system without keyrings that are valid for its # installation, then we might end up with a fully installed
# sources.list. # system without keyrings that are valid for its sources.list.
my @pkgs_to_install_from_outside; my @pkgs_to_install_from_outside;
# install apt if necessary # install apt if necessary
@ -1777,8 +1788,8 @@ sub setup {
} }
# since apt will be run inside the chroot, make sure that # since apt will be run inside the chroot, make sure that
# apt-transport-https and ca-certificates gets installed first if any # apt-transport-https and ca-certificates gets installed first
# mirror is a https URI # if any mirror is a https URI
open(my $pipe_apt, '-|', 'apt-get', 'indextargets', '--format', '$(URI)', 'Created-By: Packages') or error "cannot start apt-get indextargets: $!"; open(my $pipe_apt, '-|', 'apt-get', 'indextargets', '--format', '$(URI)', 'Created-By: Packages') or error "cannot start apt-get indextargets: $!";
while (my $uri = <$pipe_apt>) { while (my $uri = <$pipe_apt>) {
if ($uri =~ /^https:\/\//) { if ($uri =~ /^https:\/\//) {
@ -1821,8 +1832,9 @@ sub setup {
if (scalar @debs_to_install == 0) { if (scalar @debs_to_install == 0) {
warning "nothing got downloaded -- maybe the packages were already installed?"; warning "nothing got downloaded -- maybe the packages were already installed?";
} else { } else {
# we need --force-depends because dpkg does not take Pre-Depends # we need --force-depends because dpkg does not take
# into account and thus doesn't install them in the right order # Pre-Depends into account and thus doesn't install
# them in the right order
info 'installing ' . (join ', ', @pkgs_to_install_from_outside) . "..."; info 'installing ' . (join ', ', @pkgs_to_install_from_outside) . "...";
run_dpkg_progress({ run_dpkg_progress({
ARGV => [@chrootcmd, 'env', '--unset=TMPDIR', ARGV => [@chrootcmd, 'env', '--unset=TMPDIR',
@ -2005,8 +2017,9 @@ sub main() {
# open the requested file for writing # open the requested file for writing
open $fh, '|-', @cmdprefix, 'sh', '-c', 'cat > "$1"', 'exec', $directory // error "failed to fork(): $!"; open $fh, '|-', @cmdprefix, 'sh', '-c', 'cat > "$1"', 'exec', $directory // error "failed to fork(): $!";
} else { } else {
# open a tar process that extracts the tarfile that we supply # open a tar process that extracts the tarfile that we
# it with on stdin to the output directory inside the chroot # supply it with on stdin to the output directory inside
# the chroot
open $fh, '|-', @cmdprefix, @tarcmd, '--directory', $directory, '--extract', '--file', '-' // error "failed to fork(): $!"; open $fh, '|-', @cmdprefix, @tarcmd, '--directory', $directory, '--extract', '--file', '-' // error "failed to fork(): $!";
} }
@ -2099,10 +2112,10 @@ sub main() {
# open the requested file for reading # open the requested file for reading
open $fh, '-|', @cmdprefix, 'sh', '-c', 'cat "$1"', 'exec', $directory // error "failed to fork(): $!"; open $fh, '-|', @cmdprefix, 'sh', '-c', 'cat "$1"', 'exec', $directory // error "failed to fork(): $!";
} else { } else {
# Open a tar process that creates a tarfile of everything in # Open a tar process that creates a tarfile of everything
# the requested directory inside the chroot and writes it to # in the requested directory inside the chroot and writes
# stdout. To emulate the behaviour of cp, change to the # it to stdout. To emulate the behaviour of cp, change to
# dirname of the requested path first. # the dirname of the requested path first.
open $fh, '-|', @cmdprefix, @tarcmd, '--directory', dirname($directory), '--create', '--file', '-', basename($directory) // error "failed to fork(): $!"; open $fh, '-|', @cmdprefix, @tarcmd, '--directory', dirname($directory), '--create', '--file', '-', basename($directory) // error "failed to fork(): $!";
} }
@ -2428,9 +2441,9 @@ sub main() {
no warnings; # don't print a warning if the following fails no warnings; # don't print a warning if the following fails
exec 'arch-test', $options->{nativearch}; exec 'arch-test', $options->{nativearch};
} }
# if exec didn't work (for example because the arch-test program is # if exec didn't work (for example because the arch-test
# missing) prepare for the worst and assume that the architecture # program is missing) prepare for the worst and assume that
# cannot be executed # the architecture cannot be executed
print "$options->{nativearch}: not supported on this machine/kernel\n"; print "$options->{nativearch}: not supported on this machine/kernel\n";
exit 1; exit 1;
} }
@ -2447,10 +2460,10 @@ sub main() {
no warnings; # don't print a warning if the following fails no warnings; # don't print a warning if the following fails
exec 'arch-test', '-n', $options->{nativearch}; exec 'arch-test', '-n', $options->{nativearch};
} }
# if exec didn't work (for example because the arch-test program is
# missing) prepare for the worst and assume that the architecture
# cannot be executed
print "$options->{nativearch}: not supported on this machine/kernel\n"; print "$options->{nativearch}: not supported on this machine/kernel\n";
# if exec didn't work (for example because the arch-test
# program is missing) prepare for the worst and assume that
# the architecture cannot be executed
exit 1; exit 1;
} }
chomp (my $content = do { local $/; <$fh> }); chomp (my $content = do { local $/; <$fh> });
@ -2585,7 +2598,8 @@ sub main() {
local $SIG{__WARN__} = sub { $message = shift; }; local $SIG{__WARN__} = sub { $message = shift; };
$ret = open $fh, '-|', @gpgcmd, '--version'; $ret = open $fh, '-|', @gpgcmd, '--version';
} }
close $fh; # we only want to check if the gpg command exists # we only want to check if the gpg command exists
close $fh;
if ($? == 0 && defined $ret && !defined $message) { if ($? == 0 && defined $ret && !defined $message) {
# find all the fingerprints of the keys apt currently # find all the fingerprints of the keys apt currently
# knows about # knows about
@ -2789,7 +2803,8 @@ sub main() {
# check if the directory is empty or contains nothing more than an # check if the directory is empty or contains nothing more than an
# empty lost+found directory. The latter exists on freshly created # empty lost+found directory. The latter exists on freshly created
# ext3 and ext4 partitions. # ext3 and ext4 partitions.
# rationale for requiring an empty directory: https://bugs.debian.org/833525 # rationale for requiring an empty directory:
# https://bugs.debian.org/833525
opendir(my $dh, $options->{root}) or error "Can't opendir($options->{root}): $!"; opendir(my $dh, $options->{root}) or error "Can't opendir($options->{root}): $!";
while (my $entry = readdir $dh) { while (my $entry = readdir $dh) {
# skip the "." and ".." entries # skip the "." and ".." entries
@ -2936,13 +2951,13 @@ sub main() {
if ($options->{maketar} or $options->{makesqfs}) { if ($options->{maketar} or $options->{makesqfs}) {
info "creating tarball..."; info "creating tarball...";
# redirect tar output to the writing end of the pipe so that the # redirect tar output to the writing end of the pipe so that
# parent process can capture the output # the parent process can capture the output
open(STDOUT, '>&', $wfh) or error "cannot open STDOUT: $!"; open(STDOUT, '>&', $wfh) or error "cannot open STDOUT: $!";
# Add ./dev as the first entries of the tar file. # Add ./dev as the first entries of the tar file.
# We cannot add them after calling tar, because there is no way to # We cannot add them after calling tar, because there is no way
# prevent tar from writing NULL entries at the end. # to prevent tar from writing NULL entries at the end.
print $devtar; print $devtar;
# pack everything except ./dev # pack everything except ./dev
@ -2978,13 +2993,13 @@ sub main() {
if ($options->{maketar} or $options->{makesqfs}) { if ($options->{maketar} or $options->{makesqfs}) {
info "creating tarball..."; info "creating tarball...";
# redirect tar output to the writing end of the pipe so that the # redirect tar output to the writing end of the pipe so that
# parent process can capture the output # the parent process can capture the output
open(STDOUT, '>&', $wfh) or error "cannot open STDOUT: $!"; open(STDOUT, '>&', $wfh) or error "cannot open STDOUT: $!";
# Add ./dev as the first entries of the tar file. # Add ./dev as the first entries of the tar file.
# We cannot add them after calling tar, because there is no way to # We cannot add them after calling tar, because there is no way
# prevent tar from writing NULL entries at the end. # to prevent tar from writing NULL entries at the end.
print $devtar; print $devtar;
if ($options->{mode} eq 'fakechroot') { if ($options->{mode} eq 'fakechroot') {
@ -3367,7 +3382,8 @@ sub main() {
$SIG{'PIPE'} = 'DEFAULT'; $SIG{'PIPE'} = 'DEFAULT';
$SIG{'TERM'} = 'DEFAULT'; $SIG{'TERM'} = 'DEFAULT';
# unblock all delayed signals (and possibly handle them) # unblock all delayed signals (and possibly handle
# them)
POSIX::sigprocmask(SIG_UNBLOCK, $sigset) or error "Can't unblock signals: $!"; POSIX::sigprocmask(SIG_UNBLOCK, $sigset) or error "Can't unblock signals: $!";
if ($options->{makesqfs}) { if ($options->{makesqfs}) {