[Pkg-utopia-commits] r1056 - packages/unstable/dhcdbd/debian

[Michael Biebl]

Author: mbiebl-guest
Date: 2006-10-10 20:21:17 +0000 (Tue, 10 Oct 2006)
New Revision: 1056

Modified:
   packages/unstable/dhcdbd/debian/changelog
   packages/unstable/dhcdbd/debian/dhcdbd.dhcp3
   packages/unstable/dhcdbd/debian/dhcdbd.postinst
Log:
Don't use exit in dhcp hook script. We don't make use of the dhc_dbus variable (yet).


Modified: packages/unstable/dhcdbd/debian/changelog
===================================================================
--- packages/unstable/dhcdbd/debian/changelog	2006-10-08 23:04:31 UTC (rev 1055)
+++ packages/unstable/dhcdbd/debian/changelog	2006-10-10 20:21:17 UTC (rev 1056)
@@ -1,3 +1,9 @@
+dhcdbd (2.0-2) unstable; urgency=low
+
+  *  Don't use "exit" in dhcp hook script (Closes: #392048)
+
+ -- Michael Biebl <biebl at teco.edu>  Tue, 10 Oct 2006 22:16:04 +0200
+
 dhcdbd (2.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/unstable/dhcdbd/debian/dhcdbd.dhcp3
===================================================================
--- packages/unstable/dhcdbd/debian/dhcdbd.dhcp3	2006-10-08 23:04:31 UTC (rev 1055)
+++ packages/unstable/dhcdbd/debian/dhcdbd.dhcp3	2006-10-10 20:21:17 UTC (rev 1056)
@@ -1,3 +1,4 @@
+# if we are called by dhcdbd, push the information acquired by dhclient back to dhcdbd
 if [ -n "${dhc_dbus}" ]; then
 		/usr/bin/dbus-send \
 		--system \
@@ -6,8 +7,5 @@
 		/com/redhat/dhcp/$interface \
 		com.redhat.dhcp.set \
 		'string:'"`env | /bin/egrep -v '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`";
-		if (( ( dhc_dbus & 31 ) == 31 )); then
-				exit 0;
-		fi;
 fi;
 

Modified: packages/unstable/dhcdbd/debian/dhcdbd.postinst
===================================================================
--- packages/unstable/dhcdbd/debian/dhcdbd.postinst	2006-10-08 23:04:31 UTC (rev 1055)
+++ packages/unstable/dhcdbd/debian/dhcdbd.postinst	2006-10-10 20:21:17 UTC (rev 1056)
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 set -e
 
 case "$1" in
@@ -21,3 +22,5 @@
 esac
 
 #DEBHELPER#
+
+exit 0