diff --git a/Makefile b/Makefile index a367a38..d896b0b 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ DESC = This package implements two system log daemons. The syslogd daemon \ is an enhanced version of the standard Berkeley utility program. The klogd \ daemon listens to kernel message sources and is responsible for prioritizing \ and processing operating system messages. -SNAPVER = 4 +SNAPVER = 5 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') diff --git a/SNAP/sysklogd.default b/SNAP/sysklogd.default index 05f1450..460c30f 100644 --- a/SNAP/sysklogd.default +++ b/SNAP/sysklogd.default @@ -1,3 +1,7 @@ # Options for sysklogd -# Add '-r' to enable remote logging -SYSKLOGD_OPTIONS='-m 0' + +# Options for syslogd +SYSLOGD_OPTIONS="-m 0" + +# Options for klogd +KLOGD_OPTINS="-c 1" diff --git a/SNAP/sysklogd.init b/SNAP/sysklogd.init index ba338b8..55528ab 100755 --- a/SNAP/sysklogd.init +++ b/SNAP/sysklogd.init @@ -1,48 +1,64 @@ #!/bin/sh ### BEGIN INIT INFO # Provides: $syslog -# Required-Start: localnet -# Required-Stop: $local_fs sendsignals +# Required-Start: $local_fs $network +# Required-Stop: $local_fs $network sendsignals # Should-Start: # Should-Stop: # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Starts kernel and system log daemons. -# Description: Starts kernel and system log daemons. +# X-Required: true ### END INIT INFO +SYSLOGD="/sbin/syslogd" +KLOGD="/sbin/klogd" + . /lib/lsb/init-functions -[ -f /etc/default/sysklogd ] && . /etc/default/sysklogd +[ -r /etc/default/sysklogd ] && . /etc/default/sysklogd case "$1" in start) - log_info_msg "Starting system log daemon" - start_daemon /sbin/syslogd $SYSKLOGD_OPTIONS && log_success_msg || \ - log_failure_msg + log_init_msg "Starting system log daemon" + start_daemon "$SYSLOGD" "$SYSLOGD_OPTIONS" && log_success_msg || \ + log_failure_msg - log_info_msg "Starting kernel log daemon" - start_daemon /sbin/klogd -c 1 && log_success_msg || log_failure_msg - ;; + log_init_msg "Starting kernel log daemon" + start_daemon "$KLOGD" "$KLOGD_OPTIONS" && log_success_msg || log_failure_msg + ;; stop) - log_info_msg "Stopping kernel log daemon" - killproc /sbin/klogd && log_success_msg || log_failure_msg + log_init_msg "Stopping kernel log daemon" + killproc /sbin/klogd && log_success_msg || log_failure_msg - log_info_msg "Stopping system log daemon" - killproc /sbin/syslogd && log_success_msg || log_failure_msg - ;; + log_init_msg "Stopping system log daemon" + killproc /sbin/syslogd && log_success_msg || log_failure_msg + ;; reload) - log_info_msg "Reloading system log daemon config file" - pid=`pidofproc syslogd` - kill -HUP "${pid}" && log_success_msg || log_failure_msg - ;; + log_init_msg "Reloading system log daemon config file" + killproc "$SYSLOGD" -HUP && log_success_msg || log_failure_msg + ;; restart) - $0 stop - sleep 1 - $0 start - ;; + $0 stop + sleep 1 + $0 start + ;; + status) - statusproc /sbin/syslogd - statusproc klogd + pid=$(pidofproc "$SYSLOGD"); + + if [ "$?" -ne 0 ]; then + echo "System log daemon is not runing" + else + echo "System log daemon running with PID: $pid" + fi + + pid=$(pidofproc "$KLOGD"); + + if [ "$?" -ne 0 ]; then + echo "Kernel log daemon is not runing" + else + echo "Kernel log daemon running with PID: $pid" + fi ;; *) echo "Usage: $0 [start|stop|reload|restart|status]"