about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2011-05-29 21:50:33 +0200
committerMichael Biebl <biebl@debian.org>2011-05-29 21:54:06 +0200
commit93b4c0e6ace254a00d3f33b5f68f9abfd1a15857 (patch)
tree52aad16dbe5d26e1c7290e7679c55602a45b6d84
parent3ea5278494932945fe5d1938804621200b7c4608 (diff)
Handle dhcp4-change and dhcp6-change events
* debian/network-manager-dispatcher.script
  - Handle dhcp4-change and dhcp6-change events (by doing nothing). This
    prevents the 01ifupdown dispatcher script from logging an error on DHCP
    lease changes. (Closes: #628154)
-rw-r--r--debian/changelog4
-rw-r--r--debian/network-manager-dispatcher.script3
2 files changed, 6 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index bd7f7980..76204046 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ network-manager (0.8.9997-1) UNRELEASED; urgency=low
     - Correctly pass iface parameter to dispatcher scripts. (Closes: #627610)
   * Update debian/libnm-glib4.symbols and debian/libnm-util2.symbols for new
     API additions.
+  * debian/network-manager-dispatcher.script
+    - Handle dhcp4-change and dhcp6-change events (by doing nothing). This
+      prevents the 01ifupdown dispatcher script from logging an error on DHCP
+      lease changes. (Closes: #628154)
 
  -- Michael Biebl <biebl@debian.org>  Fri, 27 May 2011 19:57:47 +0200
 
diff --git a/debian/network-manager-dispatcher.script b/debian/network-manager-dispatcher.script
index 9cd12d06..5869bda5 100644
--- a/debian/network-manager-dispatcher.script
+++ b/debian/network-manager-dispatcher.script
@@ -40,7 +40,8 @@ case "$2" in
 #	export PHASE="pre-down"
 #	exec run-parts /etc/network/if-down.d
 #	;;
-    hostname)
+    hostname|dhcp4-change|dhcp6-change)
+        # Do nothing
 	;;
     *)
 	echo "$0: called with unknown action \`$2'" 1>&2