rpms/squid/devel squid.init,1.8,1.9 squid.spec,1.85,1.86

[Martin Bacovsky (mbacovsk)]

Author: mbacovsk

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6001

Modified Files:
	squid.init squid.spec 
Log Message:
* Thu Jul 19 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE14-1
- update to latest upstream 2.6.STABLE14
- resolves: #247064: Initscript Review



Index: squid.init
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- squid.init	19 Jul 2007 20:42:07 -0000	1.8
+++ squid.init	24 Jul 2007 14:32:02 -0000	1.9
@@ -36,16 +36,10 @@
 # determine the name of the squid binary
 [ -f /usr/sbin/squid ] && SQUID=squid
 
-if [ $1 -ne 'status' ]; then
-	[ -z "$SQUID" ] && exit 1
-
-	# Check that networking is up.
-	[ ${NETWORKING} = "no" ] && exit 1
-
-	# check if the squid conf file is present
-	[ -f /etc/squid/squid.conf ] || exit 6
-else 
+if [ $1 == 'status' ]; then
 	[ -z "$SQUID" ] && exit 4
+else 
+	[ -z "$SQUID" ] && exit 1
 fi
 
 prog="$SQUID"
@@ -57,12 +51,22 @@
 
 RETVAL=0
 
+probe() {
+	# Check that networking is up.
+	[ ${NETWORKING} = "no" ] && exit 1
+
+	# check if the squid conf file is present
+	[ -f /etc/squid/squid.conf ] || exit 6
+}    
+
 start() {
+	probe
+
     for adir in $CACHE_SWAP; do
-        if [ ! -d $adir/00 ]; then 
-	     echo -n "init_cache_dir $adir... "
-	     $SQUID -z -F -D >> /var/log/squid/squid.out 2>&1
-	fi
+		if [ ! -d $adir/00 ]; then 
+			 echo -n "init_cache_dir $adir... "
+			 $SQUID -z -F -D >> /var/log/squid/squid.out 2>&1
+		fi
     done
     echo -n $"Starting $prog: "
     $SQUID $SQUID_OPTS >> /var/log/squid/squid.out 2>&1
@@ -129,9 +133,6 @@
     status $SQUID && $SQUID -k check
 }
 
-probe() {
-    return 0
-}    
 
 case "$1" in
 start)
@@ -160,6 +161,7 @@
 
 probe)
     probe
+	return 0
     ;;
 
 *)


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- squid.spec	19 Jul 2007 20:42:07 -0000	1.85
+++ squid.spec	24 Jul 2007 14:32:02 -0000	1.86
@@ -190,8 +190,8 @@
 %dir %{_datadir}/squid
 %config(noreplace) %{_datadir}/squid/errors
 %config(noreplace) /etc/squid/icons
-%config(noreplace) /etc/rc.d/init.d/squid
-%config(noreplace) /etc/logrotate.d/squid
+%attr(755,root,root) /etc/rc.d/init.d/squid
+%attr(755,root,root) /etc/logrotate.d/squid
 %{_datadir}/squid/icons
 %{_sbindir}/squid
 %{_sbindir}/squidclient