forked from josch/mmdebstrap
also choose null format if stdout is /dev/null and check whether major and minor number of /dev/null are as expected to avoid false positives
This commit is contained in:
parent
ccd4b5c163
commit
ebfac91738
1 changed files with 56 additions and 14 deletions
70
mmdebstrap
70
mmdebstrap
|
@ -42,6 +42,7 @@ use Carp;
|
||||||
use Term::ANSIColor;
|
use Term::ANSIColor;
|
||||||
use Socket;
|
use Socket;
|
||||||
use Time::HiRes;
|
use Time::HiRes;
|
||||||
|
use Math::BigInt;
|
||||||
use version;
|
use version;
|
||||||
|
|
||||||
## no critic (InputOutput::RequireBriefOpen)
|
## no critic (InputOutput::RequireBriefOpen)
|
||||||
|
@ -175,6 +176,25 @@ sub error {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# The encoding of dev_t is MMMM Mmmm mmmM MMmm, where M is a hex digit of
|
||||||
|
# the major number and m is a hex digit of the minor number.
|
||||||
|
sub major {
|
||||||
|
my $rdev = shift;
|
||||||
|
my $right
|
||||||
|
= Math::BigInt->from_hex("0x00000000000fff00")->band($rdev)->brsft(8);
|
||||||
|
my $left
|
||||||
|
= Math::BigInt->from_hex("0xfffff00000000000")->band($rdev)->brsft(32);
|
||||||
|
return $right->bior($left);
|
||||||
|
}
|
||||||
|
|
||||||
|
sub minor {
|
||||||
|
my $rdev = shift;
|
||||||
|
my $right = Math::BigInt->from_hex("0x00000000000000ff")->band($rdev);
|
||||||
|
my $left
|
||||||
|
= Math::BigInt->from_hex("0x00000ffffff00000")->band($rdev)->brsft(12);
|
||||||
|
return $right->bior($left);
|
||||||
|
}
|
||||||
|
|
||||||
# check whether a directory is mounted by comparing the device number of the
|
# check whether a directory is mounted by comparing the device number of the
|
||||||
# directory itself with its parent
|
# directory itself with its parent
|
||||||
sub is_mountpoint {
|
sub is_mountpoint {
|
||||||
|
@ -5149,7 +5169,22 @@ sub main() {
|
||||||
|
|
||||||
# figure out the right format
|
# figure out the right format
|
||||||
if ($format eq 'auto') {
|
if ($format eq 'auto') {
|
||||||
if ($options->{target} eq '/dev/null') {
|
# (stat(...))[6] is the device identifier which contains the major and
|
||||||
|
# minor numbers for character special files
|
||||||
|
# major 1 and minor 3 is /dev/null on Linux
|
||||||
|
if ( $options->{target} eq '/dev/null'
|
||||||
|
and $OSNAME eq 'linux'
|
||||||
|
and -c '/dev/null'
|
||||||
|
and major((stat("/dev/null"))[6]) == 1
|
||||||
|
and minor((stat("/dev/null"))[6]) == 3) {
|
||||||
|
$format = 'null';
|
||||||
|
} elsif ($options->{target} eq '-'
|
||||||
|
and $OSNAME eq 'linux'
|
||||||
|
and major((stat(STDOUT))[6]) == 1
|
||||||
|
and minor((stat(STDOUT))[6]) == 3) {
|
||||||
|
# by checking the major and minor number of the STDOUT fd we also
|
||||||
|
# can detect redirections to /dev/null and choose the null format
|
||||||
|
# accordingly
|
||||||
$format = 'null';
|
$format = 'null';
|
||||||
} elsif ($options->{target} ne '-' and -d $options->{target}) {
|
} elsif ($options->{target} ne '-' and -d $options->{target}) {
|
||||||
$format = 'directory';
|
$format = 'directory';
|
||||||
|
@ -5226,6 +5261,11 @@ sub main() {
|
||||||
error "the $format format is unable to write to standard output";
|
error "the $format format is unable to write to standard output";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($format eq 'null'
|
||||||
|
and none { $_ eq $options->{target} } ('-', '/dev/null')) {
|
||||||
|
info "ignoring target $options->{target} with null format";
|
||||||
|
}
|
||||||
|
|
||||||
if (any { $_ eq $format } ('tar', 'squashfs', 'ext2', 'null')) {
|
if (any { $_ eq $format } ('tar', 'squashfs', 'ext2', 'null')) {
|
||||||
if ($format ne 'null') {
|
if ($format ne 'null') {
|
||||||
if ( any { $_ eq $options->{variant} } ('extract', 'custom')
|
if ( any { $_ eq $options->{variant} } ('extract', 'custom')
|
||||||
|
@ -5777,9 +5817,9 @@ sub main() {
|
||||||
# change signal handler message
|
# change signal handler message
|
||||||
$waiting_for = "cleanup";
|
$waiting_for = "cleanup";
|
||||||
|
|
||||||
if (any { $_ eq $format } ('directory', 'null')) {
|
if (any { $_ eq $format } ('directory')) {
|
||||||
# nothing to do
|
# nothing to do
|
||||||
} elsif (any { $_ eq $format } ('tar', 'squashfs', 'ext2')) {
|
} elsif (any { $_ eq $format } ('tar', 'squashfs', 'ext2', 'null')) {
|
||||||
if (!-e $options->{root}) {
|
if (!-e $options->{root}) {
|
||||||
error "$options->{root} does not exist";
|
error "$options->{root} does not exist";
|
||||||
}
|
}
|
||||||
|
@ -6405,16 +6445,17 @@ Without that option the default format is I<auto>. The following formats exist:
|
||||||
|
|
||||||
When selecting this format (the default), the actual format will be inferred
|
When selecting this format (the default), the actual format will be inferred
|
||||||
from the I<TARGET> positional argument. If I<TARGET> was not specified, then
|
from the I<TARGET> positional argument. If I<TARGET> was not specified, then
|
||||||
the B<tar> format will be chosen. If I<TARGET> happens to be F</dev/null>, then
|
the B<tar> format will be chosen. If I<TARGET> happens to be F</dev/null> or if
|
||||||
the B<null> format will be chosen. If I<TARGET> is an existing directory, and
|
standard output is F</dev/null>, then the B<null> format will be chosen. If
|
||||||
does not equal to C<->, then the B<directory> format will be chosen. If
|
I<TARGET> is an existing directory, and does not equal to C<->, then the
|
||||||
I<TARGET> ends with C<.tar> or with one of the filename extensions listed in
|
B<directory> format will be chosen. If I<TARGET> ends with C<.tar> or with one
|
||||||
the section B<COMPRESSION>, or if I<TARGET> equals C<->, or if I<TARGET> is a
|
of the filename extensions listed in the section B<COMPRESSION>, or if
|
||||||
named pipe (fifo) or if I<TARGET> is a character special file like
|
I<TARGET> equals C<->, or if I<TARGET> is a named pipe (fifo) or if I<TARGET>
|
||||||
F</dev/null>, then the B<tar> format will be chosen. If I<TARGET> ends with
|
is a character special file, then the B<tar> format will be chosen. If
|
||||||
C<.squashfs> or C<.sqfs>, then the B<squashfs> format will be chosen. If
|
I<TARGET> ends with C<.squashfs> or C<.sqfs>, then the B<squashfs> format will
|
||||||
<TARGET> ends with C<.ext2> then the B<ext2> format will be chosen. If none of
|
be chosen. If <TARGET> ends with C<.ext2> then the B<ext2> format will be
|
||||||
these conditions apply, the B<directory> format will be chosen.
|
chosen. If none of these conditions apply, the B<directory> format will be
|
||||||
|
chosen.
|
||||||
|
|
||||||
=item B<directory>, B<dir>
|
=item B<directory>, B<dir>
|
||||||
|
|
||||||
|
@ -6468,7 +6509,8 @@ A temporary chroot directory will be created in C<$TMPDIR> or F</tmp> if
|
||||||
C<$TMPDIR> is not set. After the bootstrap is complete, the temporary chroot
|
C<$TMPDIR> is not set. After the bootstrap is complete, the temporary chroot
|
||||||
will be deleted without being part of the output. This is most useful when the
|
will be deleted without being part of the output. This is most useful when the
|
||||||
desired artifact is generated inside the chroot and it is transferred using
|
desired artifact is generated inside the chroot and it is transferred using
|
||||||
special hooks such as B<sync-out>.
|
special hooks such as B<sync-out>. It is also useful in situations where only
|
||||||
|
the exit code or stdout or stderr of a process run in a hook is of interest.
|
||||||
|
|
||||||
=back
|
=back
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue