completely kill dhcdbd

diff -r 7ac8ac79b9ae initscript/SUSE/networkmanager.in
--- a/initscript/SUSE/networkmanager.in Tue Apr 22 13:24:46 2008 +0200
+++ b/initscript/SUSE/networkmanager.in Wed Apr 23 19:23:07 2008 +0200
@@ -10,9 +10,6 @@
 
 [EMAIL PROTECTED]@
 
-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
diff -r 7ac8ac79b9ae initscript/paldo/NetworkManager.in
--- a/initscript/paldo/NetworkManager.in        Tue Apr 22 13:24:46 2008 +0200
+++ b/initscript/paldo/NetworkManager.in        Wed Apr 23 19:23:07 2008 +0200
@@ -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
-- 
:wq
_______________________________________________
NetworkManager-list mailing list
[email protected]
http://mail.gnome.org/mailman/listinfo/networkmanager-list

Reply via email to