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

do not skip package installation in 'custom' variant

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2019-03-25 14:27:34 +01:00
parent ea8315a5f1
commit 6a51d410ec
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mmdebstrap
View file

@ -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
if ($options->{variant} ne 'custom') {
run_hooks('essential', $options); 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.
# #