* debian/network-manager-dispatcher.script

  - Map NetworkManager down event to ifupdown post-down phase.
    (Closes: #562811)
  - Map vpn-up/vpn-down event to ifupdown post-up/post-down phase.
    (Closes: #518530)
  - Comment out pre-up/pre-down events as they are not supported upstream.
  - Add hostname event but don't hook it up with a particular action.

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3532 ceb527fc-18e6-0310-9fe2-813c157c29e7

2 files changed, 24 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index 42bdb494..71a8380b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,13 @@ network-manager (0.8-1) UNRELEASED; urgency=low
     - debian/patches/04-etc-hosts-rewrite.patch
     - debian/patches/05-ifupdown-allow-hotplug-autoconnect.patch
     - debian/patches/03-hostname-fallback.patch
+  * debian/network-manager-dispatcher.script
+    - Map NetworkManager down event to ifupdown post-down phase.
+      (Closes: #562811)
+    - Map vpn-up/vpn-down event to ifupdown post-up/post-down phase.
+      (Closes: #518530)
+    - Comment out pre-up/pre-down events as they are not supported upstream.
+    - Add hostname event but don't hook it up with a particular action.
 
  -- Michael Biebl <biebl@debian.org>  Fri, 19 Feb 2010 21:41:06 +0100
 
diff --git a/debian/network-manager-dispatcher.script b/debian/network-manager-dispatcher.script
index fd182853..9cd12d06 100644
--- a/debian/network-manager-dispatcher.script
+++ b/debian/network-manager-dispatcher.script
@@ -2,6 +2,7 @@
 # Script to dispatch NetworkManager events
 #
 # Runs ifupdown scripts when NetworkManager fiddles with interfaces.
+# See NetworkManager(8) for further documentation of the dispatcher events.
 
 if [ -z "$1" ]; then
     echo "$0: called with no interface" 1>&2
@@ -17,26 +18,30 @@ export VERBOSITY="0"
 
 # Run the right scripts
 case "$2" in
-    up)
+    up|vpn-up)
 	export MODE="start"
 	export PHASE="post-up"
 	exec run-parts /etc/network/if-up.d
 	;;
-    down)
-	export MODE="stop"
-	export PHASE="pre-down"
-	exec run-parts /etc/network/if-down.d
-	;;
-    pre-up)
-	export MODE="start"
-	export PHASE="pre-up"
-	exec run-parts /etc/network/if-pre-up.d
-	;;
-    post-down)
+    down|vpn-down)
 	export MODE="stop"
 	export PHASE="post-down"
 	exec run-parts /etc/network/if-post-down.d
 	;;
+# pre-up/pre-down not implemented. See
+# https://bugzilla.gnome.org/show_bug.cgi?id=387832
+#    pre-up)
+#	export MODE="start"
+#	export PHASE="pre-up"
+#	exec run-parts /etc/network/if-pre-up.d
+#	;;
+#    pre-down)
+#	export MODE="stop"
+#	export PHASE="pre-down"
+#	exec run-parts /etc/network/if-down.d
+#	;;
+    hostname)
+	;;
     *)
 	echo "$0: called with unknown action \`$2'" 1>&2
 	exit 1