2005-12-06 Dan Williams <dcbw@redhat.com>

Slackware patches from Paul Blazejowski <paulb@blazebox.homeip.net>
	* 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
This commit is contained in:
Dan Williams
2005-12-06 21:24:23 +00:00
parent b8c9b829c0
commit 58d310199c
3 changed files with 12 additions and 1 deletions

View File

@@ -1,3 +1,13 @@
2005-12-06 Dan Williams <dcbw@redhat.com>
Slackware patches from Paul Blazejowski <paulb@blazebox.homeip.net>
* 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 <rml@novell.com>
* src/NetworkManager.c: don't call nm_data_free() when there is nothing

View File

@@ -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

View File

@@ -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");
}