main/sysklogd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

The following changes were made

Browse Source 
* 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)
This commit is contained in:
Jay Larson
2017-12-02 16:51:21 -06:00
parent 9f9452db63
commit a17524bbcf
4 changed files with 53 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -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 = 6
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')

31
SNAP/sysklogd.init
View File

@@ -12,7 +12,9 @@
### END INIT INFO
SYSLOGD="/sbin/syslogd"
SPIDFILE="/var/run/syslogd.pid"
KLOGD="/sbin/klogd"
KPIDFILE="/var/run/klogd.pid"
. /lib/lsb/init-functions
[ -r /etc/default/sysklogd ] && . /etc/default/sysklogd
@@ -23,19 +25,30 @@ case "$1" in
start_daemon "$SYSLOGD" "$SYSLOGD_OPTIONS" && log_success_msg || \
log_failure_msg
if [ -z "$container" ]; then
log_init_msg "Starting kernel log daemon"
start_daemon "$KLOGD" "$KLOGD_OPTIONS" && log_success_msg || log_failure_msg
start_daemon "$KLOGD" "$KLOGD_OPTIONS" && log_success_msg || \
log_failure_msg
fi
;;
stop)
log_init_msg "Stopping kernel log daemon"
killproc /sbin/klogd && log_success_msg || log_failure_msg
log_init_msg "Stopping system log daemon"
killproc /sbin/syslogd && log_success_msg || log_failure_msg
killproc -p "$SPIDFILE" "$SYSLOGD" && log_success_msg || log_failure_msg
if [ -z "$container" ]; then
log_init_msg "Stopping kernel log daemon"
killproc -p "$KPIDFILE" "$KLOGD" && log_success_msg || log_failure_msg
fi
;;
reload)
log_init_msg "Reloading system log daemon config file"
killproc "$SYSLOGD" -HUP && log_success_msg || log_failure_msg
killproc -p "$SPIDFILE" "$SYSLOGD" -HUP && log_success_msg || \
log_failure_msg
if [ -z "$container" ]; then
killproc -p "$KPIDFILE" "$KLOGD" -USR2 && log_success_msg || \
log_failure_msg
fi
;;
restart)
$0 stop
@@ -44,7 +57,7 @@ case "$1" in
;;
status)
pid=$(pidofproc "$SYSLOGD");
pid=$(pidofproc -p "$SPIDFILE" "$SYSLOGD");
if [ "$?" -ne 0 ]; then
echo "System log daemon is not runing"
@@ -52,13 +65,15 @@ case "$1" in
echo "System log daemon running with PID: $pid"
fi
pid=$(pidofproc "$KLOGD");
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]"

19
SNAP/usher
View File

@@ -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
install -m 644 ${TARGET}/usr/share/sysklogd/syslog.conf \
${TARGET}/etc/syslog.conf
if [ ! -f /etc/syslog.conf ]; then
install -m 644 /usr/share/sysklogd/syslog.conf /etc/syslog.conf
fi
if [ ! -f ${TARGET}/etc/default/sysklogd ]; then
install -m 644 ${TARGET}/usr/share/sysklogd/sysklogd.default \
${TARGET}/etc/default/sysklogd
if [ ! -f /etc/default/sysklogd ]; then
install -m 644 /usr/share/sysklogd/sysklogd.default /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