From: Michael Prokop <mika@grml.org>
Date: Sat, 20 Jun 2009 11:29:37 +0000 (+0200)
Subject: Exclude udev's persistent files from initrd
X-Git-Tag: v0.99.4^0
X-Git-Url: http://git.grml.org/?p=grml-terminalserver.git;a=commitdiff_plain;h=974676db6ae7b53889338b426132e09470b311b1

Exclude udev's persistent files from initrd
---

diff --git a/debian/changelog b/debian/changelog
index 35cb2ac..e6c20e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+grml-terminalserver (0.99.4) unstable; urgency=low
+
+  * Exclude udev's persistent files from initrd: Grml netboot packages
+    ship persistent files of udev. This doesn't break anything, but
+    names of network and cdrom/dvd devices might be unusual/unexpected.
+    Thanks to Christian Hofstaedtler for the bugreport!
+    [Closes: issue697]
+
+ -- Michael Prokop <mika@grml.org>  Sat, 20 Jun 2009 13:27:38 +0200
+
 grml-terminalserver (0.99.3) unstable; urgency=low
 
   * grml-terminalserver-config
diff --git a/grml-terminalserver-config b/grml-terminalserver-config
index e5ade48..8e8b4c3 100755
--- a/grml-terminalserver-config
+++ b/grml-terminalserver-config
@@ -141,6 +141,17 @@ function actionMkInitrd
 
 function mkInitrdNew
 {
+  # we do not want to include persistent configuration files
+  # from udev in the initrd
+  udev_tmp_=$(mktemp -d terminalserver__udev.XXXXXX)
+  persistent=false
+  if ls /etc/udev/rules.d/*persistent* >/dev/null 2>&1 ; then
+    persistent_files=true
+    for f in /etc/udev/rules.d/*persistent* ; do
+      mv "$f" "${udev_tmp_}/"
+    done
+  fi
+
   set -e
   local cfg_="/etc/initramfs-tools/initramfs.conf"
   local tmp_="`mktemp -t terminalserver__initramfsbk.XXXXXX`"
@@ -153,6 +164,12 @@ function mkInitrdNew
   mv $initrd_ $PATH_/minirt26.gz
   mv ${initrd_}.bak $initrd_
   set +e
+
+  # restore udev configuration files
+  if $persistent_files ; then
+    mv ${udev_tmp_}/* /etc/udev/rules.d/
+    rmdir "${udev_tmp_}"
+  fi
 }
 
 function mkInitrd