[SCM] live-build branch, debian-next, updated. debian/3.0_a25-1-39-gcacf9b6

Daniel Baumann daniel at debian.org
Mon Jul 25 16:03:56 UTC 2011


The following commit has been merged in the debian-next branch:
commit cacf9b6e34d08aaf8f1637d9b14b1db4219582a2
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Jul 25 18:05:40 2011 +0200

    Simplify bind mounting of the config tree during local hooks are run by using read-only bind mounts.

diff --git a/scripts/build/lb_chroot_hooks b/scripts/build/lb_chroot_hooks
index 2baf770..7080459 100755
--- a/scripts/build/lb_chroot_hooks
+++ b/scripts/build/lb_chroot_hooks
@@ -71,8 +71,7 @@ then
 
 	# 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
+	mount -o bind,ro config chroot/root/config
 
 	for _HOOK in config/hooks/*.chroot
 	do
@@ -93,8 +92,8 @@ then
 	done
 
 	# Remove bind mount of build config inside chroot.
-	umount chroot/root/config/
-	rmdir chroot/root/config/
+	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