Attachment 294030 Details for Bug 245307 – Patch for squid.init

[patch] Patch for squid.init

squid_init.patch (text/plain), 1.22 KB, created by Martin Nagy on 2008-02-05 18:36:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Nagy

Created: 2008-02-05 18:36:01 UTC

Size: 1.22 KB

patch

obsolete

>Index: squid.init
>===================================================================
>RCS file: /cvs/dist/rpms/squid/RHEL-4/squid.init,v
>retrieving revision 1.7
>diff -u -r1.7 squid.init
>--- squid.init	25 Oct 2006 11:41:34 -0000	1.7
>+++ squid.init	5 Feb 2008 18:34:24 -0000
>@@ -21,12 +21,6 @@
> # Source networking configuration.
> . /etc/sysconfig/network
> 
>-# Check that networking is up.
>-[ ${NETWORKING} = "no" ] && exit 0
>-
>-# check if the squid conf file is present
>-[ -f /etc/squid/squid.conf ] || exit 0
>-
> if [ -f /etc/sysconfig/squid ]; then
>   . /etc/sysconfig/squid
> fi
>@@ -37,9 +31,7 @@
> SQUID_PIDFILE_TIMEOUT=${SQUID_PIDFILE_TIMEOUT:-20}
> SQUID_SHUTDOWN_TIMEOUT=${SQUID_SHUTDOWN_TIMEOUT:-100}
> 
>-# determine the name of the squid binary
>-[ -f /usr/sbin/squid ] && SQUID=squid
>-[ -z "$SQUID" ] && exit 0
>+SQUID=squid
> 
> prog="$SQUID"
> 
>@@ -51,6 +43,15 @@
> RETVAL=0
> 
> start() {
>+    # Check that networking is up.
>+    [ "${NETWORKING}" = "no" ] && exit 1
>+
>+    # check if the squid conf file is present
>+    [ -f /etc/squid/squid.conf ] || exit 6
>+
>+    # check if the binary is executable
>+    [ -x /usr/sbin/squid ] || exit 1
>+
>     for adir in $CACHE_SWAP; do
>         if [ ! -d $adir/00 ]; then 
> 	     echo -n "init_cache_dir $adir... "

Actions: View | Diff

Attachments on bug 245307: 294023 | 294030