forked from josch/mmdebstrap
if we got dpkg >= 1.20.0, then we don't have to create certain files and directories ourselves
This commit is contained in:
parent
e8144b1fbb
commit
dc67c1f4be
1 changed files with 32 additions and 10 deletions
42
mmdebstrap
42
mmdebstrap
|
@ -41,6 +41,7 @@ use POSIX qw(SIGINT SIGHUP SIGPIPE SIGTERM SIG_BLOCK SIG_UNBLOCK);
|
||||||
use Carp;
|
use Carp;
|
||||||
use Term::ANSIColor;
|
use Term::ANSIColor;
|
||||||
use Socket;
|
use Socket;
|
||||||
|
use version;
|
||||||
|
|
||||||
## no critic (InputOutput::RequireBriefOpen)
|
## no critic (InputOutput::RequireBriefOpen)
|
||||||
|
|
||||||
|
@ -1234,23 +1235,43 @@ sub setup {
|
||||||
sub run_setup() {
|
sub run_setup() {
|
||||||
my $options = shift;
|
my $options = shift;
|
||||||
|
|
||||||
|
my $dpkgversion;
|
||||||
|
{
|
||||||
|
open my $fh, '-|', 'dpkg', '--robot',
|
||||||
|
'--version' // error "failed to fork(): $!";
|
||||||
|
chomp(
|
||||||
|
$dpkgversion = do { local $/; <$fh> }
|
||||||
|
);
|
||||||
|
close $fh;
|
||||||
|
if ($? == 0 and $dpkgversion =~ /^([0-9]+\.[0-9]+\.[0-9]+) \(\S+\)$/) {
|
||||||
|
# dpkg is new enough for the --robot option
|
||||||
|
$dpkgversion = version->new($1);
|
||||||
|
} else {
|
||||||
|
$dpkgversion = undef;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
my @directories = (
|
my @directories = (
|
||||||
'/etc/apt/apt.conf.d', '/etc/apt/sources.list.d',
|
'/etc/apt/apt.conf.d', '/etc/apt/sources.list.d',
|
||||||
'/etc/apt/preferences.d', '/var/cache/apt',
|
'/etc/apt/preferences.d', '/var/cache/apt',
|
||||||
'/var/lib/apt/lists/partial', '/var/lib/dpkg',
|
'/var/lib/apt/lists/partial', '/tmp'
|
||||||
'/etc/dpkg/dpkg.cfg.d/', '/tmp'
|
|
||||||
);
|
);
|
||||||
|
# we need /var/lib/dpkg in case we need to write to /var/lib/dpkg/arch
|
||||||
|
push @directories, '/var/lib/dpkg';
|
||||||
|
if (not defined $dpkgversion or $dpkgversion < "1.20.0") {
|
||||||
|
push @directories, '/etc/dpkg/dpkg.cfg.d/';
|
||||||
|
}
|
||||||
# if dpkg and apt operate from the outside we need some more
|
# if dpkg and apt operate from the outside we need some more
|
||||||
# directories because dpkg and apt might not even be installed inside
|
# directories because dpkg and apt might not even be installed inside
|
||||||
# the chroot
|
# the chroot
|
||||||
if ($options->{mode} eq 'chrootless') {
|
if ($options->{mode} eq 'chrootless') {
|
||||||
push @directories,
|
push @directories, '/var/log/apt';
|
||||||
(
|
if (not defined $dpkgversion or $dpkgversion < "1.20.0") {
|
||||||
'/var/log/apt', '/var/lib/dpkg/triggers',
|
push @directories, '/var/lib/dpkg/triggers',
|
||||||
'/var/lib/dpkg/info', '/var/lib/dpkg/alternatives',
|
'/var/lib/dpkg/info', '/var/lib/dpkg/alternatives',
|
||||||
'/var/lib/dpkg/updates'
|
'/var/lib/dpkg/updates';
|
||||||
);
|
}
|
||||||
}
|
}
|
||||||
foreach my $dir (@directories) {
|
foreach my $dir (@directories) {
|
||||||
if (-e "$options->{root}/$dir") {
|
if (-e "$options->{root}/$dir") {
|
||||||
|
@ -1343,6 +1364,7 @@ sub run_setup() {
|
||||||
close $fh;
|
close $fh;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# apt-get update requires this
|
||||||
{
|
{
|
||||||
open my $fh, '>', "$options->{root}/var/lib/dpkg/status"
|
open my $fh, '>', "$options->{root}/var/lib/dpkg/status"
|
||||||
or error "failed to open(): $!";
|
or error "failed to open(): $!";
|
||||||
|
@ -1351,7 +1373,7 @@ sub run_setup() {
|
||||||
|
|
||||||
# /var/lib/dpkg/available is required to exist or otherwise package
|
# /var/lib/dpkg/available is required to exist or otherwise package
|
||||||
# removals will fail
|
# removals will fail
|
||||||
{
|
if (not defined $dpkgversion or $dpkgversion < "1.20.0") {
|
||||||
open my $fh, '>', "$options->{root}/var/lib/dpkg/available"
|
open my $fh, '>', "$options->{root}/var/lib/dpkg/available"
|
||||||
or error "failed to open(): $!";
|
or error "failed to open(): $!";
|
||||||
close $fh;
|
close $fh;
|
||||||
|
@ -1359,7 +1381,7 @@ sub run_setup() {
|
||||||
|
|
||||||
# /var/lib/dpkg/cmethopt is used by dselect
|
# /var/lib/dpkg/cmethopt is used by dselect
|
||||||
# see #930788
|
# see #930788
|
||||||
{
|
if (not defined $dpkgversion or $dpkgversion < "1.20.0") {
|
||||||
open my $fh, '>', "$options->{root}/var/lib/dpkg/cmethopt"
|
open my $fh, '>', "$options->{root}/var/lib/dpkg/cmethopt"
|
||||||
or error "failed to open(): $!";
|
or error "failed to open(): $!";
|
||||||
print $fh "apt apt\n";
|
print $fh "apt apt\n";
|
||||||
|
|
Loading…
Reference in a new issue