[SCM] live-build branch, debian-old-2.0, updated. f5f8671ab6f22f63990dcd5cb02c2bf2b32e0659

[Daniel Baumann]

The following commit has been merged in the debian-old-2.0 branch:
commit f5f8671ab6f22f63990dcd5cb02c2bf2b32e0659
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Jul 8 19:25:13 2012 +0200

    Truncating udev persistent net rules in remove-udev-persistent-rules.chroot hook rather than to remove them (Closes: #680763).
    
    This allows to have non-persistent net devices with persistence properly,
    see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680763#10 for more information.

diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks
index d27d2d4..8048116 100755
--- a/scripts/build/lb_chroot_hacks
+++ b/scripts/build/lb_chroot_hacks
@@ -147,8 +147,14 @@ rm -f chroot/var/lib/dbus/machine-id
 # they are regenerated by live-config.
 rm -f chroot/etc/ssh/ssh_host_*_key chroot/etc/ssh/ssh_host_*_key.pub
 
-# Removing udev mac caching rule
-rm -f chroot/etc/udev/rules.d/*persistent-net.rules
+# Truncating udev mac caching rule
+for _FILE in /etc/udev/rules.d/*persistent-net.rules
+do
+	if [ -e "${_FILE}" ]
+	then
+		: > ${_FILE}
+	fi
+done
 
 case "${LB_BINARY_IMAGES}" in
 	net)

-- 
live-build