Author: glen
Date: Mon Dec 19 10:25:21 2005
New Revision: 6671

Modified:
   initng/daemon/squid.i
Log:
- use rc-scripts to get lockfiles in place

Modified: initng/daemon/squid.i
==============================================================================
--- initng/daemon/squid.i       (original)
+++ initng/daemon/squid.i       Mon Dec 19 10:25:21 2005
@@ -1,68 +1,10 @@
+# Autogenerated by ./migrate_rc.d-initng.i.sh on Mon Dec 19 11:19:36 EET 2005
 service daemon/squid {
-       need = system/initial system/hostname system/rundir;
+       need = system/initial system/hostname system/mountfs system/rundir;
        require_network;
-       nice = +5;
 
-       script start = {
-               # Sanity check
-               [ -f /etc/squid/squid.conf ] || exit 0
-
-               # Source function library
-               . /etc/rc.d/init.d/functions
-
-               # Get service config
-               [ -f /etc/sysconfig/squid ] && . /etc/sysconfig/squid
-
-               msg_starting Squid
-               ulimit -n 8192
-               daemon squid $SQUID_OPTS
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/squid
-
-               exit $RETVAL
-       }
-
-       script stop = {
-               # Sanity check
-               [ -f /etc/squid/squid.conf ] || exit 0
-
-               # Source function library
-               . /etc/rc.d/init.d/functions
-
-               # Get service config
-               [ -f /etc/sysconfig/squid ] && . /etc/sysconfig/squid
-
-               # Set default shutdown timeout if it is not set in service 
config
-               SQUID_SHUTDOWN_TIMEOUT=${SQUID_SHUTDOWN_TIMEOUT:-60}
-
-               msg_stopping Squid
-
-               if [ -f /var/run/squid.pid ]; then
-                       PID=$(filter_chroot `cat /var/run/squid.pid`)
-                       if [ -z "$PID" ]; then
-                               PID=0
-                       fi
-               else
-                       PID=0
-               fi
-               killproc squid
-               RETVAL=$?
-               if [ ! $PID -eq 0 ]; then
-                       show "Waiting for Squid to stop"
-                       busy
-                       timeout=0
-                       while ps -U squid -o user | grep -q ^squid
-                       do
-                               if [ $timeout -ge $SQUID_SHUTDOWN_TIMEOUT ]; 
then
-                                       break
-                               fi
-                               sleep 1
-                               timeout=$((timeout+1))
-                       done
-                       ok
-               fi
-               rm -f /var/lock/subsys/squid >/dev/null 2>&1
-
-               exit $RETVAL
-       }
+       exec start = /etc/rc.d/init.d/squid;
+       exec_args start = start;
+       exec stop = /etc/rc.d/init.d/squid;
+       exec_args stop = stop;
 }
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to