NetworkManager r3615 - in trunk: . initscript/SUSE initscript/paldo

[dcbw svn gnome org]

Author: dcbw
Date: Mon Apr 28 04:29:03 2008
New Revision: 3615
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3615&view=rev

Log:
2008-04-27  Dan Williams  <dcbw redhat com>

	Patch from Benoit Boissinot <bboissin+networkmanager gmail com>

	* initscript/paldo/NetworkManager.in
	  initscript/SUSE/networkmanager.in
		- Remove last bits of dhcdbd



Modified:
   trunk/ChangeLog
   trunk/initscript/SUSE/networkmanager.in
   trunk/initscript/paldo/NetworkManager.in

Modified: trunk/initscript/SUSE/networkmanager.in
==============================================================================
--- trunk/initscript/SUSE/networkmanager.in	(original)
+++ trunk/initscript/SUSE/networkmanager.in	Mon Apr 28 04:29:03 2008
@@ -10,9 +10,6 @@
 
 sbindir= sbindir@
 
-DHCDBD_BIN=${sinbidr}/dhcdbd
-test -x $DHCDBD_BIN || exit 5
-
 NETWORKMANAGER_BIN=${sbindir}/NetworkManager
 test -x $NETWORKMANAGER_BIN || exit 5
 
@@ -21,12 +18,6 @@
 
 case "$1" in
 	start)
-		checkproc $DHCDBD_BIN
-		if [ $? != 0 ]; then
-			echo -n "Starting the DHCP DBUS Daemon"
-			startproc $DHCDBD_BIN --system
-			rc_status -v
-		fi
 		checkproc $NETWORKMANAGER_BIN
 		if [ $? = 0 ]; then
 			echo -n "NetworkManager already running"
@@ -41,8 +32,6 @@
 		echo -n "Shutting down the NetworkManager"
 		killproc -TERM $NETWORKMANAGER_BIN
 		rc_status -v
-		echo -n "Shutting down the DHCP DBUS Daemon"
-		killproc -TERM $DHCDBD_BIN
 		;;
 	restart)
 		$0 stop
@@ -50,9 +39,6 @@
 		rc_status
 		;;
 	status)
-		echo -n "Checking for the DHCP DBUS Daemon: "
-		checkproc $DHCDBD_BIN
-		rc_status -v
 		echo -n "Checking for the NetworkManager: "
 		checkproc $NETWORKMANAGER_BIN
 		rc_status -v

Modified: trunk/initscript/paldo/NetworkManager.in
==============================================================================
--- trunk/initscript/paldo/NetworkManager.in	(original)
+++ trunk/initscript/paldo/NetworkManager.in	Mon Apr 28 04:29:03 2008
@@ -1,8 +1,8 @@
 #!/bin/bash
 ### BEGIN INIT INFO
 # Provides: NetworkManager
-# Required-Start: $network dbus dhcdbd
-# Required-Stop: $network dbus dhcdbd
+# Required-Start: $network dbus
+# Required-Stop: $network dbus
 # Default-Start: 3 4 5
 # Default-Stop: 0 1 2 6
 ### END INIT INFO