diff options
| author | Dan Williams <dcbw@redhat.com> | 2008-04-28 04:29:03 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2008-04-28 04:29:03 +0000 |
| commit | d1fcfe94749855a236707667242670795b73fa41 (patch) | |
| tree | 19d74beb26794717b261db95b27e9a3bfd436eb5 /initscript | |
| parent | ccdbc475e697a08925323e035b065bc08a1e254a (diff) | |
| download | NetworkManager-d1fcfe94749855a236707667242670795b73fa41.tar.gz | |
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
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3615 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'initscript')
| -rw-r--r-- | initscript/SUSE/networkmanager.in | 14 | ||||
| -rw-r--r-- | initscript/paldo/NetworkManager.in | 4 |
2 files changed, 2 insertions, 16 deletions
diff --git a/initscript/SUSE/networkmanager.in b/initscript/SUSE/networkmanager.in index ada215c675..df2cd24a2b 100644 --- a/initscript/SUSE/networkmanager.in +++ b/initscript/SUSE/networkmanager.in @@ -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 @@ rc_reset 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 @@ case "$1" in 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 @@ case "$1" in 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 --git a/initscript/paldo/NetworkManager.in b/initscript/paldo/NetworkManager.in index ebf709970f..144b237a8e 100644 --- a/initscript/paldo/NetworkManager.in +++ b/initscript/paldo/NetworkManager.in @@ -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 |