Package: dnsmasq
Version: 2.41-2
Severity: normal
Tags: patch
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu hardy ubuntu-patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
In Ubuntu, we've applied the attached patch to make the init script lsb
compliant.
We thought you might be interested in doing the same.
- -- System Information:
Debian Release: lenny/sid
APT prefers hardy
APT policy: (500, 'hardy')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.24-12-generic (SMP w/2 CPU cores)
Locale: LANG=da_DK.UTF-8, LC_CTYPE=da_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFH7Ol2onjfXui9pOMRAnqDAJ4izc93G7ntiShjDMs5t7cDax+hBgCgrJG7
o6CSdwSrAaVa6rPGm1njlkE=
=Sre7
-----END PGP SIGNATURE-----
diff -u dnsmasq-2.41/debian/init dnsmasq-2.41/debian/init
--- dnsmasq-2.41/debian/init
+++ dnsmasq-2.41/debian/init
@@ -26,6 +26,8 @@
test "$ENABLED" != "0" || exit 0
test -x $DAEMON || exit 0
+. /lib/lsb/init-functions
+
# RESOLV_CONF:
# If the resolvconf package is installed then use the resolv conf file
# that it provides as the default. Otherwise use /etc/resolv.conf as
@@ -131,71 +133,76 @@
case "$1" in
start)
- echo -n "Starting $DESC: $NAME"
+ log_daemon_msg "Starting $DESC" "$NAME"
start
case "$?" in
0)
- echo "."
+ log_end_msg 0
start_resolvconf
exit 0
;;
1)
- echo " (already running)."
+ log_warning_msg "(already running)"
+ log_end_msg 0
exit 0
;;
*)
- echo " (failed)."
+ log_warning_msg "failed"
+ log_end_msg 1
exit 1
;;
esac
;;
stop)
stop_resolvconf
- echo -n "Stopping $DESC: $NAME"
+ log_daemon_msg "Stopping $DESC" "$NAME"
stop
case "$?" in
- 0) echo "." ; exit 0 ;;
- 1) echo " (not running)." ; exit 0 ;;
- *) echo " (failed)." ; exit 1 ;;
+ 0) log_end_msg 0 ; exit 0 ;;
+ 1) log_warning_msg "not running" ; log_end_msg 0 ; exit 0 ;;
+ *) log_warning_msg "failed" ; log_end_msg 1 ; exit 1 ;;
esac
;;
restart|force-reload)
stop_resolvconf
- echo -n "Restarting $DESC: $NAME"
+ log_daemon_msg "Restarting $DESC" "$NAME"
stop
case "$?" in
0|1)
start
case "$?" in
0)
- echo "."
+ log_end_msg 0
start_resolvconf
exit 0
;;
1)
- echo " (failed -- old process is still
running)."
+ log_warning_msg "failed -- old process
is still running"
+ log_end_msg 1
exit 1
;;
*)
- echo " (failed to start)."
+ log_warning_msg "failed to start"
+ log_end_msg 1
exit 1
;;
esac
;;
*)
- echo " (failed to stop)."
+ log_warning_msg "failed to stop"
+ log_end_msg 1
exit 1
;;
esac
;;
status)
- echo -n "Checking $DESC: $NAME"
+ log_daemon_msg "Checking $DESC" "$NAME"
status
case "$?" in
- 0) echo " (running)" ; exit 0 ;;
- 1) echo " (dead, pid file exists)" ; exit 1 ;;
- 3) echo " (not running)" ; exit 3 ;;
- *) echo " (unknown)" ; exit 4 ;;
+ 0) log_warning_msg "running" ; log_msg_end 0; exit 0 ;;
+ 1) log_warning_msg "dead, pid file exists" ; log_msg_end 1;
exit 1 ;;
+ 3) log_warning_msg "not running" ; log_msg_end 3; exit 3 ;;
+ *) log_warning_msg "unknown" ; log_msg_end 4; exit 4 ;;
esac
;;
*)
