Make the config available to all hooks.

Previously, the config was bindmounted inside the chroot only for hooks
from the config dir, now it is done earlier so it is available for all
hooks.

Note that it is now also done if there are no hooks, but this is
probably enough of an exception case to not warrant the extra plumbing
required to detect the case (and doing an extra bindmount shouldn't
really hurt anyway...).
This commit is contained in:
Matthijs Kooijman 2012-01-10 20:11:52 +01:00
parent ea491a1a1a
commit e7ecf56be3
1 changed files with 9 additions and 8 deletions

View File

@ -40,6 +40,10 @@ Create_lockfile .lock
## Processing distribution hooks
# Make build config available to chroot hooks.
mkdir -p chroot/root/config
mount -o bind,ro config chroot/root/config
# Copying hooks
for _HOOK in ${LB_CHROOT_HOOKS}
do
@ -69,10 +73,6 @@ then
# Restoring cache
Restore_cache cache/packages_chroot
# Make build config available to chroot hooks.
mkdir -p chroot/root/config
mount -o bind,ro config chroot/root/config
for _HOOK in config/hooks/*.chroot
do
# Copying hook
@ -91,13 +91,14 @@ then
rm -f chroot/root/"$(basename ${_HOOK})"
done
# Remove bind mount of build config inside chroot.
umount chroot/root/config
rmdir chroot/root/config
# Saving cache
Save_cache cache/packages_chroot
# Creating stage file
Create_stagefile .stage/chroot_hooks
fi
# Remove bind mount of build config inside chroot.
umount chroot/root/config
rmdir chroot/root/config