The following changes were made

* killproc in init script now properly uses PID files
  * pidofproc now checks PID files in init script
  * Will no longer attempt to start klogd if running in container
  * Updated default syslog.conf to prevent annoying 'noone' errors
  * Updated usher to use /bin/sh
  * Removed chroot from usher (will be performed by latest snap)

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 = 3
+SNAPVER = 7
 
 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
 TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
@@ -60,7 +60,7 @@ $(ROOT): $(SRCDIR)/syslogd
 	install -v -d -m 755 $(ROOT)/usr/share/sysklogd && \
 	install -v -m 644 $(PWD)/SNAP/sysklogd.default \
 		$(ROOT)/usr/share/sysklogd/sysklogd.default && \
-	install -v -m 644 $(PWD)/SNAP/sysklogd.init \
+	install -v -m 755 $(PWD)/SNAP/sysklogd.init \
 		$(ROOT)/etc/init.d/sysklogd && \
 	install -v -m 644 $(PWD)/SNAP/syslog.conf \
 		$(ROOT)/usr/share/sysklogd/syslog.conf

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"

SNAP/sysklogd.init

@@ -1,48 +1,79 @@
 #!/bin/sh
 ### BEGIN INIT INFO
 # Provides:            $syslog
-# Required-Start:      localnet
+# Required-Start:      $local_fs $network
-# Required-Stop:       $local_fs sendsignals
+# 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"
+SPIDFILE="/var/run/syslogd.pid"
+KLOGD="/sbin/klogd"
+KPIDFILE="/var/run/klogd.pid"
+
 . /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"
+    log_init_msg "Starting system log daemon"
-    start_daemon /sbin/syslogd $SYSKLOGD_OPTIONS && log_success_msg || \
+    start_daemon "$SYSLOGD" "$SYSLOGD_OPTIONS" && log_success_msg || \
       log_failure_msg
 
-    log_info_msg "Starting kernel log daemon"
+    if [ -z "$container" ]; then
-    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
+    fi
     ;;
   stop)
-    log_info_msg "Stopping kernel log daemon"
+    log_init_msg "Stopping system log daemon"
-    killproc /sbin/klogd && log_success_msg || log_failure_msg
+    killproc -p "$SPIDFILE" "$SYSLOGD" && log_success_msg || log_failure_msg
 
-    log_info_msg "Stopping system log daemon"
+    if [ -z "$container" ]; then
-    killproc /sbin/syslogd && log_success_msg || log_failure_msg
+      log_init_msg "Stopping kernel log daemon"
+      killproc -p "$KPIDFILE" "$KLOGD" && log_success_msg || log_failure_msg
+    fi
     ;;
   reload)
-    log_info_msg "Reloading system log daemon config file"
+    log_init_msg "Reloading system log daemon config file"
-    pid=`pidofproc syslogd`
+    killproc -p "$SPIDFILE" "$SYSLOGD" -HUP && log_success_msg || \
-    kill -HUP "${pid}" && log_success_msg || log_failure_msg
+      log_failure_msg
+
+    if [ -z "$container" ]; then
+      killproc -p "$KPIDFILE" "$KLOGD" -USR2 && log_success_msg || \
+        log_failure_msg
+    fi
     ;;
   restart)
     $0 stop
     sleep 1
     $0 start
     ;;
+
   status)
-    statusproc /sbin/syslogd
+    pid=$(pidofproc -p "$SPIDFILE" "$SYSLOGD");
-    statusproc klogd
+
+    if [ "$?" -ne 0 ]; then
+      echo "System log daemon is not runing"
+    else
+      echo "System log daemon running with PID: $pid"
+    fi
+
+    if [ -z "$container" ]; then
+      pid=$(pidofproc -p "$KPIDFILE" "$KLOGD");
+
+      if [ "$?" -ne 0 ]; then
+        echo "Kernel log daemon is not runing"
+      else
+        echo "Kernel log daemon running with PID: $pid"
+      fi
+    fi
     ;;
   *)
     echo "Usage: $0 [start|stop|reload|restart|status]"

SNAP/usher

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
 
@@ -7,21 +7,18 @@ case $1 in
     exit 0
     ;;
   postinst)
-    if [ ! -f ${TARGET}/etc/syslog.conf ]; then
+    if [ ! -f /etc/syslog.conf ]; then
-      install -m 644 ${TARGET}/usr/share/sysklogd/syslog.conf \
+      install -m 644 /usr/share/sysklogd/syslog.conf /etc/syslog.conf
-        ${TARGET}/etc/syslog.conf
     fi
-    if [ ! -f ${TARGET}/etc/default/sysklogd ]; then
+    if [ ! -f /etc/default/sysklogd ]; then
-      install -m 644 ${TARGET}/usr/share/sysklogd/sysklogd.default \
+      install -m 644 /usr/share/sysklogd/sysklogd.default /etc/default/sysklogd
-        ${TARGET}/etc/default/sysklogd
     fi
 	
-    if [[ ! ${TARGET} ]]; then
+    if [ -f /var/run/syslogd.pid ]; then
       /etc/init.d/sysklogd restart
-      update-rc enable sysklogd
-    else
-      chroot ${TARGET} 'update-rc enable sysklogd'
     fi
+
+    update-rc enable sysklogd
     ;;
   prerm)
     exit 0