From 88befb176680d6f88bcdd11bd347d0f1680efdf5 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Tue, 23 Aug 2011 17:13:45 +0200
Subject: Moving removal of udev persistent rules from chroot_hacks to a hook,
 that way it can be easily skipped if desired.

---
 functions/defaults.sh                               |  6 ++++--
 scripts/build/lb_chroot_hacks                       |  3 ---
 share/hooks/005-remove-udev-persistent-rules.chroot | 10 ++++++++++
 3 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100755 share/hooks/005-remove-udev-persistent-rules.chroot

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 5538dfbae..3fc895f44 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -588,7 +588,8 @@ Set_defaults ()
 				update-apt-xapian-index \
 				update-mlocate-database \
 				remove-openssh-server-host-keys \
-				remove-python-py}"
+				remove-python-py \
+				remove-udev-persistent-rules}"
 			;;
 
 		kubuntu)
@@ -597,7 +598,8 @@ Set_defaults ()
 				update-mlocate-database \
 				remove-gnome-icon-cache \
 				remove-openssh-server-host-keys \
-				remove-python-py}"
+				remove-python-py \
+				remove-udev-persistent-rules}"
 			;;
 	esac
 
diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks
index 501352f15..c6e2775d9 100755
--- a/scripts/build/lb_chroot_hacks
+++ b/scripts/build/lb_chroot_hacks
@@ -140,9 +140,6 @@ do
 	esac
 done
 
-# Removing udev mac caching rule
-rm -f chroot/etc/udev/rules.d/*persistent-net.rules
-
 case "${LB_BINARY_IMAGES}" in
 	net)
 		if [ ! -f chroot/usr/bin/smbmount ]
diff --git a/share/hooks/005-remove-udev-persistent-rules.chroot b/share/hooks/005-remove-udev-persistent-rules.chroot
new file mode 100755
index 000000000..c7eec20b1
--- /dev/null
+++ b/share/hooks/005-remove-udev-persistent-rules.chroot
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+# Remove udev persistent rules.
+#
+# This removes udev persistent rules that cache the host systems mac address to
+# remember its device name.
+
+rm -f /etc/udev/rules.d/*persistent-net.rules
-- 
cgit v1.2.3