[SCM] live-build branch, debian, updated. debian/3.0_a25-1-57-g6167d10

Daniel Baumann daniel at debian.org
Thu Aug 4 19:53:18 UTC 2011


The following commit has been merged in the debian branch:
commit 50816947a79f9f407e237cca563a14f2a33b76d5
Author: Cody A.W. Somerville <cody.somerville at canonical.com>
Date:   Thu Jul 21 18:35:56 2011 +0200

    Making config tree available to chroot hooks.

diff --git a/scripts/build/lb_chroot_hooks b/scripts/build/lb_chroot_hooks
index 5c4df7d..2baf770 100755
--- a/scripts/build/lb_chroot_hooks
+++ b/scripts/build/lb_chroot_hooks
@@ -69,6 +69,11 @@ then
 	# Restoring cache
 	Restore_cache cache/packages_chroot
 
+	# Make build config available to chroot hooks.
+	mkdir -p chroot/root/config
+	mount --bind config/ chroot/root/config
+	mount -o remount,ro chroot/root/config
+
 	for _HOOK in config/hooks/*.chroot
 	do
 		# Copying hook
@@ -87,6 +92,10 @@ 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
 

-- 
live-build



More information about the debian-live-changes mailing list