Package: squid
Version: 2.5.7-8
Severity: minor
Tags: patch
Here is a patch which improves the output of the initscript, making it
conform to two initscript conventions.
Doing something that takes a while...done.
Starting a service: servicename.
The first one is discussed in policy 9.4.
With the patch applied, here are examples of the output:
# /etc/init.d/squid stop
Stopping proxy server: squid.
# /etc/init.d/squid start
Starting proxy server: squid.
# /etc/init.d/squid restart
Restarting proxy server: (waiting....done) squid.
# /etc/init.d/squid stop
Stopping proxy server: (waiting................done) squid.
-- System Information:
Debian Release: 3.1
APT prefers testing
APT policy: (500, 'testing'), (50, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.10
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15)
Versions of packages squid depends on:
ii adduser 3.59 Add and remove users and groups
ii coreutils 5.2.1-2 The GNU core utilities
ii debconf 1.4.32 Debian configuration management sy
ii libc6 2.3.2.ds1-20 GNU C Library: Shared libraries an
ii libldap2 2.1.30-3 OpenLDAP libraries
ii libpam0g 0.76-22 Pluggable Authentication Modules l
ii logrotate 3.7-2 Log rotation utility
ii netbase 4.20 Basic TCP/IP networking system
ii squid-common 2.5.7-8 Internet Object Cache (WWW proxy c
-- debconf information:
squid/fix_cachedir_perms: false
* squid/largefiles_warning:
squid/anonymize_headers:
squid-cgi/cachemgr:
squid/old_version: false
squid/http_anonymizer:
squid/authenticate_program:
squid/fix_lines: true
--- squid_ORIG 2004-08-09 18:07:06.000000000 +0200
+++ squid 2005-02-09 21:27:51.000000000 +0100
@@ -123,7 +123,7 @@
sleep 2
if test -n "$PID" && kill -0 $PID 2>/dev/null
then
- echo -n "Waiting ."
+ echo -n "(waiting..."
cnt=0
while kill -0 $PID 2>/dev/null
do
@@ -133,13 +133,23 @@
#
# Waited 120 seconds now. Fail.
#
- echo -n " Failed.. "
- break
+ echo -n "failed)"
+ if [ "$1" = verbose ] ; then
+ echo "."
+ else
+ echo -n " "
+ fi
+ return
fi
sleep 2
echo -n "."
done
- [ "$1" = verbose ] && echo "done."
+ echo -n "done)"
+ if [ "$1" = verbose ] ; then
+ echo " $NAME."
+ else
+ echo -n " "
+ fi
else
[ "$1" = verbose ] && echo "$NAME."
fi
@@ -156,7 +166,7 @@
stop verbose
;;
reload|force-reload)
- echo -n "Reloading $NAME configuration files: "
+ echo -n "Reloading $NAME configuration files..."
start-stop-daemon --stop --signal 1 \
--pidfile $PIDFILE --quiet --exec $DAEMON
echo "done."
@@ -169,7 +179,7 @@
;;
*)
echo "Usage: /etc/init.d/$NAME {start|stop|reload|force-reload|restart}"
- exit 1
+ exit 3
;;
esac
