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

move extract hook execution after run_prepare so that fakechroot works in it

Browse source
This commit is contained in:
Johannes Schauer Marin Rodrigues 2022-12-22 11:51:01 +01:00
parent eb98dfbaee
commit a7b7e16033
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mmdebstrap
View file

@ -1818,14 +1818,16 @@ sub setup {
} }
eval { eval {
run_hooks('extract', $options);
if ($options->{variant} ne 'extract') {
my $chrootcmd = []; my $chrootcmd = [];
if ($options->{variant} ne 'extract') {
if ($options->{mode} ne 'chrootless') { if ($options->{mode} ne 'chrootless') {
$chrootcmd = run_prepare($options); $chrootcmd = run_prepare($options);
} }
}
run_hooks('extract', $options, $essential_pkgs);
if ($options->{variant} ne 'extract') {
run_essential($options, $essential_pkgs, $chrootcmd, $cached_debs); run_essential($options, $essential_pkgs, $chrootcmd, $cached_debs);
run_hooks('essential', $options); run_hooks('essential', $options);
@ -6948,10 +6950,6 @@ respectively.
Extract the downloaded packages into the rootfs. Extract the downloaded packages into the rootfs.
=item B<extract-hook>
Run B<--extract-hook> options and all F<extract*> scripts in B<--hook-dir>.
=item B<prepare> =item B<prepare>
In B<fakechroot> mode, environment variables C<LD_LIBRARY_PATH> will be set up In B<fakechroot> mode, environment variables C<LD_LIBRARY_PATH> will be set up
@ -6960,6 +6958,10 @@ in. For foreign B<fakechroot> environments, C<LD_LIBRARY_PATH> and
C<QEMU_LD_PREFIX> are set up accordingly. This step is not carried out in C<QEMU_LD_PREFIX> are set up accordingly. This step is not carried out in
B<extract> mode and neither for the B<chrootless> variant. B<extract> mode and neither for the B<chrootless> variant.
=item B<extract-hook>
Run B<--extract-hook> options and all F<extract*> scripts in B<--hook-dir>.
=item B<essential> =item B<essential>
Uses C<dpkg --install> to properly install all packages that have been Uses C<dpkg --install> to properly install all packages that have been