Package: sysklogd
Version: 1.4.1-18
Severity: minor
Tags: patch
Hi,
the attached patch changes the sysklogd init.d script(s) to use lsb
logging functions.
Regards,
David
diff -ur ./sysklogd-1.4.1.orig/debian/control ./sysklogd-1.4.1/debian/control
--- ./sysklogd-1.4.1.orig/debian/control 2006-08-27 17:15:22.000000000
+0200
+++ ./sysklogd-1.4.1/debian/control 2006-08-27 17:21:16.000000000 +0200
@@ -7,7 +7,7 @@
Package: sysklogd
Architecture: any
Section: admin
-Depends: ${shlibs:Depends}, klogd | linux-kernel-log-daemon
+Depends: ${shlibs:Depends}, klogd | linux-kernel-log-daemon, lsb-base (>=
3.0-10)
Conflicts: syslogd
Provides: syslogd, system-log-daemon
Replaces: syslogd
@@ -20,7 +20,7 @@
Package: klogd
Architecture: any
Section: admin
-Depends: ${shlibs:Depends}, sysklogd | system-log-daemon
+Depends: ${shlibs:Depends}, sysklogd | system-log-daemon, lsb-base (>= 3.0-10)
Conflicts: sysklogd (<= 1.3-33)
Provides: linux-kernel-log-daemon
Replaces: sysklogd
diff -ur ./sysklogd-1.4.1.orig/debian/rc ./sysklogd-1.4.1/debian/rc
--- ./sysklogd-1.4.1.orig/debian/rc 2006-08-27 17:15:22.000000000 +0200
+++ ./sysklogd-1.4.1/debian/rc 2006-08-27 17:19:02.000000000 +0200
@@ -9,6 +9,7 @@
test -x $binpath || exit 0
test ! -r /etc/default/syslogd || . /etc/default/syslogd
+. /lib/lsb/init-functions
create_xconsole()
{
@@ -57,42 +58,42 @@
case "$1" in
start)
- echo -n "Starting system log daemon: syslogd"
+ log_daemon_msg "Starting system log daemon" "syslogd"
create_xconsole
start-stop-daemon --start --quiet --exec $binpath -- $SYSLOGD
- echo "."
+ log_end_msg 0
;;
stop)
- echo -n "Stopping system log daemon: syslogd"
+ log_daemon_msg "Stopping system log daemon" "syslogd"
start-stop-daemon --stop --quiet --exec $binpath --pidfile $pidfile
- echo "."
+ log_end_msg 0
;;
reload|force-reload)
- echo -n "Reloading system log daemon: syslogd"
+ log_daemon_msg "Reloading system log daemon" "syslogd"
start-stop-daemon --stop --quiet --signal 1 --exec $binpath --pidfile
$pidfile
- echo "."
+ log_end_msg 0
;;
restart)
- echo -n "Restarting system log daemon: syslogd"
+ log_daemon_msg "Restarting system log daemon" "syslogd"
start-stop-daemon --stop --quiet --exec $binpath --pidfile $pidfile
sleep 1
start-stop-daemon --start --quiet --exec $binpath -- $SYSLOGD
- echo "."
+ log_end_msg 0
;;
reload-or-restart)
if running
then
- echo -n "Reloading system log daemon: syslogd"
+ log_daemon_msg "Reloadings system log daemon" "syslogd"
start-stop-daemon --stop --quiet --signal 1 --exec $binpath --pidfile
$pidfile
else
- echo -n "Restarting system log daemon: syslogd"
+ log_daemon_msg "Restarting system log daemon" "syslogd"
start-stop-daemon --start --quiet --exec $binpath -- $SYSLOGD
fi
- echo "."
+ log_end_msg 0
;;
*)
echo "Usage: /etc/init.d/sysklogd
{start|stop|reload|restart|force-reload|reload-or-restart}"
- exit 1
+ exit 2
esac
exit 0
diff -ur ./sysklogd-1.4.1.orig/debian/rc.klogd ./sysklogd-1.4.1/debian/rc.klogd
--- ./sysklogd-1.4.1.orig/debian/rc.klogd 2006-08-27 17:15:22.000000000
+0200
+++ ./sysklogd-1.4.1/debian/rc.klogd 2006-08-27 17:20:47.000000000 +0200
@@ -9,6 +9,7 @@
test -f $binpath || exit 0
test ! -r /etc/default/klogd || . /etc/default/klogd
+. /lib/lsb/init-functions
running()
{
@@ -47,24 +48,24 @@
case "$1" in
start)
- echo -n "Starting kernel log daemon: klogd"
+ log_daemon_msg "Starting kernel log daemon" "klogd"
start-stop-daemon --start --quiet --exec $binpath -- $KLOGD
- echo "."
+ log_end_msg 0
;;
stop)
- echo -n "Stopping kernel log daemon: klogd"
+ log_daemon_msg "Stopping kernel log daemon" "klogd"
start-stop-daemon --stop --retry TERM/1/TERM/1/TERM/4/KILL --quiet --exec
$binpath --pidfile $pidfile
- echo "."
+ log_end_msg 0
;;
restart|force-reload)
- echo -n "Restarting kernel log daemon: klogd"
+ log_daemon_msg "Restarting kernel log daemon" "klogd"
start-stop-daemon --stop --retry TERM/1/TERM/1/TERM/4/KILL --quiet --exec
$binpath --pidfile $pidfile
start-stop-daemon --start --quiet --exec $binpath -- $KLOGD
- echo "."
+ log_end_msg 0
;;
*)
echo "Usage: /etc/init.d/klogd {start|stop|restart|force-reload}"
- exit 1
+ exit 2
esac
exit 0
