From 6a51d410ec2ff94cf29614b908a8975a1a371dd0 Mon Sep 17 00:00:00 2001 From: Johannes 'josch' Schauer Date: Mon, 25 Mar 2019 14:27:34 +0100 Subject: [PATCH] do not skip package installation in 'custom' variant --- mmdebstrap | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mmdebstrap b/mmdebstrap index 3b8ada0..d5b1f33 100755 --- a/mmdebstrap +++ b/mmdebstrap @@ -1373,9 +1373,9 @@ sub setup { } } 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 - } 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') { # this borrows from and extends # /etc/fakechroot/debootstrap.env and /etc/fakechroot/chroot.env @@ -1549,9 +1549,11 @@ sub setup { } # 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 # can be installed from the inside. #