From 58d310199ce4eb7555c04855da96f124054b4740 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 6 Dec 2005 21:24:23 +0000 Subject: [PATCH] 2005-12-06 Dan Williams Slackware patches from Paul Blazejowski * initscript/Slackware/rc.networkmanager - Cosmetic fix * src/backends/NetworkManagerSlackware.c - Kill dhcpcd when starting so that dhclient can bind to DHCP on interfaces git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1127 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 10 ++++++++++ initscript/Slackware/rc.networkmanager | 2 +- src/backends/NetworkManagerSlackware.c | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b2d7c04273..5543aba7e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-12-06 Dan Williams + + Slackware patches from Paul Blazejowski + * initscript/Slackware/rc.networkmanager + - Cosmetic fix + + * src/backends/NetworkManagerSlackware.c + - Kill dhcpcd when starting so that dhclient can bind to DHCP on + interfaces + 2005-12-05 Robert Love * src/NetworkManager.c: don't call nm_data_free() when there is nothing diff --git a/initscript/Slackware/rc.networkmanager b/initscript/Slackware/rc.networkmanager index 6f89385386..e00a42efbb 100755 --- a/initscript/Slackware/rc.networkmanager +++ b/initscript/Slackware/rc.networkmanager @@ -19,7 +19,7 @@ RETVAL=0 start() { - if [ "`pgrep dbus-daemon-1`" = "" ]; then + if [ "`pgrep dbus-daemon`" = "" ]; then echo -n "D-BUS must be running to start NetworkManager" exit 1 fi diff --git a/src/backends/NetworkManagerSlackware.c b/src/backends/NetworkManagerSlackware.c index e45802d991..2a3ee7c78f 100644 --- a/src/backends/NetworkManagerSlackware.c +++ b/src/backends/NetworkManagerSlackware.c @@ -188,6 +188,7 @@ void nm_system_delete_default_route (void) */ void nm_system_kill_all_dhcp_daemons (void) { + nm_spawn_process ("/bin/killall -q dhcpcd"); }