fixes for new daemon();

Changed files:
    apache.init -> 1.2

diff --git a/apache.init b/apache.init
index 10f79865dc458f679b39fc2b0bc72b496d668f36..4702c3f26f7f00934119d170248e2907d1f9f321 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # Startup script for the Apache Web Server
 #
@@ -17,17 +17,21 @@
 # Check that networking is up.
 [ "${NETWORKING}" = "no" ] && exit0
 
+# Try set service nice level
+if [ -f /etc/sysconfig/apache ]; then
+    . /etc/sysconfig/apache
+fi    
 # See how we were called.
 case "$1" in
   start)
        show Starting httpd
-       daemon +5 httpd 
+       daemon httpd 
        touch /var/lock/subsys/httpd
        ;;
   stop)
        show Shutting down httpd
        killproc httpd  
-       rm -f /var/lock/subsys/httpd /var/run/httpd.pid
+       rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc*
        ;;
   status)
        status httpd
@@ -43,6 +47,3 @@ case "$1" in
 esac
 
 exit 0
-
-
-