5 files changed, 23 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index 31ec279..05fb8bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+itzks-systems (2012.08.29.2) UNRELEASED; urgency=low
+
+  * etc/network/if-up.d/{autofs,cups}:
+    + Rename to itzks-autofs, itzks-cups to avoid future name conflicts.
+    + Test for scripts of the names autofs resp. cups and debian-edu and
+      if they exist, exit gracefully.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Wed, 29 Aug 2012 21:02:48 +0200
+
 itzks-systems (2012.08.29.1) squeeze-backports; urgency=low
 
   * /debian/itzks-systems-disklserver.install, sbin/diskless-workstation-shell:
diff --git a/etc/network/if-up.d/autofs b/etc/network/if-up.d/autofs
deleted file mode 100755
index 1e0a705..0000000
--- a/etc/network/if-up.d/autofs
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-invoke-rc.d --quiet autofs restart
-
diff --git a/etc/network/if-up.d/cups b/etc/network/if-up.d/cups
deleted file mode 100755
index f7e41e7..0000000
--- a/etc/network/if-up.d/cups
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-invoke-rc.d --quiet cups restart
-
diff --git a/etc/network/if-up.d/itzks-autofs b/etc/network/if-up.d/itzks-autofs
new file mode 100755
index 0000000..974a1c6
--- /dev/null
+++ b/etc/network/if-up.d/itzks-autofs
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if test -e /etc/network/if-up.d/autofs; then exit 0; fi
+if test -e /etc/network/if-up.d/debian-edu; then exit 0; fi
+
+invoke-rc.d --quiet autofs restart
+
diff --git a/etc/network/if-up.d/itzks-cups b/etc/network/if-up.d/itzks-cups
new file mode 100755
index 0000000..229e9ab
--- /dev/null
+++ b/etc/network/if-up.d/itzks-cups
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if test -e /etc/network/if-up.d/cups; then exit 0; fi
+if test -e /etc/network/if-up.d/debian-edu; then exit 0; fi
+
+invoke-rc.d --quiet cups restart
+