NetworkManager r3592 - trunk/initscript/RedHat

[dcbw svn gnome org]

Author: dcbw
Date: Thu Apr 24 19:16:11 2008
New Revision: 3592
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3592&view=rev

Log:
2008-04-24  Dan Williams  <dcbw redhat com>

	* initscript/RedHat/NetworkManager.in
	  initscript/RedHat/NetworkManagerDispatcher.in
		- Be active at runlevel 2
		- Adjust priorities earlier



Modified:
   trunk/initscript/RedHat/NetworkManager.in
   trunk/initscript/RedHat/NetworkManagerDispatcher.in

Modified: trunk/initscript/RedHat/NetworkManager.in
==============================================================================
--- trunk/initscript/RedHat/NetworkManager.in	(original)
+++ trunk/initscript/RedHat/NetworkManager.in	Thu Apr 24 19:16:11 2008
@@ -2,7 +2,7 @@
 #
 # NetworkManager:   NetworkManager daemon
 #
-# chkconfig: - 98 02
+# chkconfig: - 27 73
 # description:  This is a daemon for automatically switching network \
 #               connections to the best available connection.
 #
@@ -10,10 +10,10 @@
 # pidfile: /var/run/NetworkManager/NetworkManager.pid
 #
 ### BEGIN INIT INFO
-# Provides: network_manager
-# Required-Start: $local_fs messagebus haldaemon
-# Required-Stop: $local_fs messagebus haldaemon
-# Default-Start:  3 4 5
+# Provides: network_manager $network
+# Required-Start: messagebus haldaemon
+# Required-Stop: messagebus haldaemon
+# Default-Start: 2 3 4 5
 # Default-Stop: 0 1 6
 # Short-Description: start and stop NetworkManager
 # Description: NetworkManager is a tool for easily managing network connections
@@ -43,8 +43,10 @@
 
 start()
 {
-	echo $"Setting network parameters... "
+	echo -n $"Setting network parameters... "
 	sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
+	success
+	echo
 
 	echo -n $"Starting NetworkManager daemon: "
 	daemon --check $servicename $processname --pid-file=$pidfile

Modified: trunk/initscript/RedHat/NetworkManagerDispatcher.in
==============================================================================
--- trunk/initscript/RedHat/NetworkManagerDispatcher.in	(original)
+++ trunk/initscript/RedHat/NetworkManagerDispatcher.in	Thu Apr 24 19:16:11 2008
@@ -2,7 +2,7 @@
 #
 # NetworkManager:   NetworkManagerDispatcher daemon
 #
-# chkconfig: - 98 02
+# chkconfig: - 28 72
 # description: This daemon automatically runs scripts when NetworkManager \
 #              changes the network state.
 #
@@ -11,9 +11,9 @@
 #
 ### BEGIN INIT INFO
 # Provides: network_manager_dispatcher
-# Required-Start: $local_fs messagebus
-# Required-Stop: $local_fs messagebus
-# Default-Start:  3 4 5
+# Required-Start: network_manager messagebus
+# Required-Stop: network_manager messagebus
+# Default-Start: 2 3 4 5
 # Default-Stop: 0 1 6
 # Short-Description: start and stop NetworkManagerDispatcher
 # Description: NetworkManagerDispatcher is a tool for running scripts triggered \