forked from josch/mmdebstrap
implement 'extract' variant
This commit is contained in:
parent
16d2a4a8d9
commit
972b207508
1 changed files with 38 additions and 25 deletions
63
mmdebstrap
63
mmdebstrap
|
@ -897,30 +897,13 @@ sub setup {
|
||||||
die "nothing got downloaded";
|
die "nothing got downloaded";
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($options->{mode} eq 'chrootless') {
|
# We have to extract the packages from @essential_pkgs either if we run in
|
||||||
print STDERR "I: installing packages...\n";
|
# chrootless mode and extract variant or in any other mode.
|
||||||
# FIXME: the dpkg config from the host is parsed before the command
|
# In other words, the only scenario in which the @essential_pkgs are not
|
||||||
# line arguments are parsed and might break this mode
|
# extracted are in chrootless mode in any other than the extract variant.
|
||||||
# Example: if the host has --path-exclude set, then this will also
|
if ($options->{mode} eq 'chrootless' and $options->{variant} ne 'extract') {
|
||||||
# affect the chroot.
|
# nothing to do
|
||||||
my @chrootless_opts = (
|
} else {
|
||||||
'-oDPkg::Options::=--force-not-root',
|
|
||||||
'-oDPkg::Options::=--force-script-chrootless',
|
|
||||||
'-oDPkg::Options::=--root=' . $options->{root},
|
|
||||||
'-oDPkg::Options::=--log=' . "$options->{root}/var/log/dpkg.log");
|
|
||||||
run_apt_progress ('apt-get', '--yes', @chrootless_opts,
|
|
||||||
'install', (map { "$options->{root}/$_" } @essential_pkgs));
|
|
||||||
if (any { $_ eq $options->{variant} } ('extract', 'custom')) {
|
|
||||||
# nothing to do
|
|
||||||
} elsif (any { $_ eq $options->{variant} } ('essential', 'apt', 'standard', 'important', 'required', 'buildd', 'minbase')) {
|
|
||||||
if (%pkgs_to_install) {
|
|
||||||
run_apt_progress ('apt-get', '--yes', @chrootless_opts,
|
|
||||||
'install', keys %pkgs_to_install);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
die "unknown variant: $options->{variant}";
|
|
||||||
}
|
|
||||||
} elsif (any { $_ eq $options->{mode} } ('root', 'unshare', 'fakechroot', 'proot')) {
|
|
||||||
print STDERR "I: extracting archives...\n";
|
print STDERR "I: extracting archives...\n";
|
||||||
print_progress 0.0;
|
print_progress 0.0;
|
||||||
my $counter = 0;
|
my $counter = 0;
|
||||||
|
@ -947,9 +930,39 @@ sub setup {
|
||||||
print_progress ($counter/$total*100);
|
print_progress ($counter/$total*100);
|
||||||
}
|
}
|
||||||
print_progress "done";
|
print_progress "done";
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($options->{mode} eq 'chrootless') {
|
||||||
|
print STDERR "I: installing packages...\n";
|
||||||
|
# FIXME: the dpkg config from the host is parsed before the command
|
||||||
|
# line arguments are parsed and might break this mode
|
||||||
|
# Example: if the host has --path-exclude set, then this will also
|
||||||
|
# affect the chroot.
|
||||||
|
my @chrootless_opts = (
|
||||||
|
'-oDPkg::Options::=--force-not-root',
|
||||||
|
'-oDPkg::Options::=--force-script-chrootless',
|
||||||
|
'-oDPkg::Options::=--root=' . $options->{root},
|
||||||
|
'-oDPkg::Options::=--log=' . "$options->{root}/var/log/dpkg.log");
|
||||||
|
if ($options->{variant} eq 'extract') {
|
||||||
|
# nothing to do
|
||||||
|
} else {
|
||||||
|
run_apt_progress ('apt-get', '--yes', @chrootless_opts,
|
||||||
|
'install', (map { "$options->{root}/$_" } @essential_pkgs));
|
||||||
|
}
|
||||||
|
if (any { $_ eq $options->{variant} } ('extract', 'custom')) {
|
||||||
|
# nothing to do
|
||||||
|
} elsif (any { $_ eq $options->{variant} } ('essential', 'apt', 'standard', 'important', 'required', 'buildd', 'minbase')) {
|
||||||
|
if (%pkgs_to_install) {
|
||||||
|
run_apt_progress ('apt-get', '--yes', @chrootless_opts,
|
||||||
|
'install', keys %pkgs_to_install);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
die "unknown variant: $options->{variant}";
|
||||||
|
}
|
||||||
|
} elsif (any { $_ eq $options->{mode} } ('root', 'unshare', 'fakechroot', 'proot')) {
|
||||||
|
|
||||||
if ($options->{variant} eq 'extract') {
|
if ($options->{variant} eq 'extract') {
|
||||||
# nothing else to do
|
# nothing to do
|
||||||
} 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') {
|
||||||
# FIXME: if trouble arises, look into /etc/fakechroot/*.env for
|
# FIXME: if trouble arises, look into /etc/fakechroot/*.env for
|
||||||
|
|
Loading…
Reference in a new issue