forked from josch/mmdebstrap
do not skip package installation in 'custom' variant
This commit is contained in:
parent
ea8315a5f1
commit
6a51d410ec
1 changed files with 6 additions and 4 deletions
10
mmdebstrap
10
mmdebstrap
|
@ -1373,9 +1373,9 @@ sub setup {
|
||||||
}
|
}
|
||||||
} elsif (any { $_ eq $options->{mode} } ('root', 'unshare', 'fakechroot', 'proot')) {
|
} elsif (any { $_ eq $options->{mode} } ('root', 'unshare', 'fakechroot', 'proot')) {
|
||||||
|
|
||||||
if (any { $_ eq $options->{variant} } ('extract', 'custom')) {
|
if (any { $_ eq $options->{variant} } ('extract')) {
|
||||||
# nothing to do
|
# nothing to do
|
||||||
} elsif (any { $_ eq $options->{variant} } ('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
|
||||||
|
@ -1549,9 +1549,11 @@ sub setup {
|
||||||
}
|
}
|
||||||
|
|
||||||
# run essential hooks
|
# run essential hooks
|
||||||
run_hooks('essential', $options);
|
if ($options->{variant} ne 'custom') {
|
||||||
|
run_hooks('essential', $options);
|
||||||
|
}
|
||||||
|
|
||||||
if (%pkgs_to_install) {
|
if ($options->{variant} ne 'custom' and %pkgs_to_install) {
|
||||||
# some packages have to be installed from the outside before anything
|
# some packages have to be installed from the outside before anything
|
||||||
# can be installed from the inside.
|
# can be installed from the inside.
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in a new issue