diff options
| author | Robert Love <rml@novell.com> | 2006-03-15 15:32:37 +0000 |
|---|---|---|
| committer | Robert Love <rlove@rlove.org> | 2006-03-15 15:32:37 +0000 |
| commit | c7e71729b7b039cf4bba1bc64fef1200989ef682 (patch) | |
| tree | 5144e709105c6e09e7e8b83e69caffc3d6bd1f60 /initscript | |
| parent | f7b52f76db8039bd90797fc6d7c5189e93b0a536 (diff) | |
2006-03-15 Robert Love <rml@novell.com>
* src/dhcp-manager/nm-dhcp-manager.c: Do not start dhcdbd, but rely on
the system init scripts (or some other mechanism) starting it (or a
compatible DBUS service) before NetworkManager runs. This means that
distributions might need to update their init scripts. This fixes
possible races and is quite a bit cleaner.
* initscript/SUSE/networkmanager.in: Update to start dhcdbd before
starting the NetworkManager daemon.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1607 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'initscript')
| -rw-r--r-- | initscript/SUSE/networkmanager.in | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/initscript/SUSE/networkmanager.in b/initscript/SUSE/networkmanager.in index df2cd24a2b..ada215c675 100644 --- a/initscript/SUSE/networkmanager.in +++ b/initscript/SUSE/networkmanager.in @@ -10,6 +10,9 @@ sbindir=@sbindir@ +DHCDBD_BIN=${sinbidr}/dhcdbd +test -x $DHCDBD_BIN || exit 5 + NETWORKMANAGER_BIN=${sbindir}/NetworkManager test -x $NETWORKMANAGER_BIN || exit 5 @@ -18,6 +21,12 @@ 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" @@ -32,6 +41,8 @@ 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 @@ -39,6 +50,9 @@ 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 |