rpms/NetworkManager/devel NetworkManager-0.4-dont-kill-nifd.patch, NONE, 1.1 NetworkManager.spec, 1.45, 1.46

[fedora-cvs-commits at redhat.com]

Author: dcbw

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4597

Modified Files:
	NetworkManager.spec 
Added Files:
	NetworkManager-0.4-dont-kill-nifd.patch 
Log Message:
* Thu May  5 2005 Dan Williams <dcbw at redhat.com> - 0.4-11.cvs22050404
- #rh154391# NetworkManager dies on startup (don't force-kill nifd)



NetworkManager-0.4-dont-kill-nifd.patch:
 NetworkManagerRedHat.c |    4 ----
 1 files changed, 4 deletions(-)

--- NEW FILE NetworkManager-0.4-dont-kill-nifd.patch ---
--- NetworkManager-0.4/src/backends/NetworkManagerRedHat.c.dont-kill-nifd	2005-05-05 14:57:48.000000000 -0400
+++ NetworkManager-0.4/src/backends/NetworkManagerRedHat.c	2005-05-05 14:57:56.000000000 -0400
@@ -39,10 +39,6 @@
 {
 	/* Kill any dhclients lying around */
 	nm_system_kill_all_dhcp_daemons ();
-
-	/* Stop nifd since we respawn mDNSResponder ourselves */
-	if (nm_spawn_process ("/etc/init.d/nifd status") != 0)
-		nm_spawn_process ("/etc/init.d/nifd stop");
 }
 
 


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- NetworkManager.spec	4 May 2005 19:01:09 -0000	1.45
+++ NetworkManager.spec	5 May 2005 19:00:47 -0000	1.46
@@ -7,7 +7,7 @@
 Name: NetworkManager
 Summary: Network link manager and user applications
 Version: 0.4
-Release: 10.cvs20050404
+Release: 11.cvs20050404
 Group: System Environment/Base
 License: GPL
 URL: http://people.redhat.com/dcbw/NetworkManager/
@@ -20,6 +20,7 @@
 Patch5: NetworkManager-0.4-aplist-fix-hidden.patch
 Patch6: NetworkManager-0.4-novarargs.patch
 Patch7: NetworkManager-0.4-dhcp-socket-leak-fix.patch
+Patch8: NetworkManager-0.4-dont-kill-nifd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 PreReq:   chkconfig
@@ -101,6 +102,7 @@
 %patch5 -p1 -b .aplist-fix-hidden
 %patch6 -p0 -b .no-varargs
 %patch7 -p1 -b .dhcp-socket-leak-fix
+%patch8 -p1 -b .dont-kill-nifd
 
 
 %build
@@ -182,6 +184,9 @@
 
 
 %changelog
+* Thu May  5 2005 Dan Williams <dcbw at redhat.com> - 0.4-11.cvs22050404
+- #rh154391# NetworkManager dies on startup (don't force-kill nifd)
+
 * Wed May  4 2005 Dan Williams <dcbw at redhat.com> - 0.4-10.cvs20050404
 - Fix leak of a socket in DHCP code