From aa6a160443b1c97d7b81baf77962e2cb9c01d08f Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 24 Apr 2008 19:16:11 +0000 Subject: [PATCH] 2008-04-24 Dan Williams * initscript/RedHat/NetworkManager.in initscript/RedHat/NetworkManagerDispatcher.in - Be active at runlevel 2 - Adjust priorities earlier git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3592 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- initscript/RedHat/NetworkManager.in | 14 ++++++++------ initscript/RedHat/NetworkManagerDispatcher.in | 8 ++++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/initscript/RedHat/NetworkManager.in b/initscript/RedHat/NetworkManager.in index 06b3ddebaa..525f2f1f83 100755 --- a/initscript/RedHat/NetworkManager.in +++ b/initscript/RedHat/NetworkManager.in @@ -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 @@ RETVAL=0 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 diff --git a/initscript/RedHat/NetworkManagerDispatcher.in b/initscript/RedHat/NetworkManagerDispatcher.in index a50adbd898..8f35c7792f 100755 --- a/initscript/RedHat/NetworkManagerDispatcher.in +++ b/initscript/RedHat/NetworkManagerDispatcher.in @@ -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 \