Accepting request 72779 from home:mtomaschewski:branches:Base:System

Disabled klogd when syslog-ng.conf reads /proc/kmsg directly

OBS-URL: https://build.opensuse.org/request/show/72779
OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=40

syslogd.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun  6 13:11:31 UTC 2011 - mt@suse.de
+
+- Disabled klogd in /etc/init.d/syslog, when the syslog-ng.conf
+  config file reads /proc/kmsg directly.
+
 -------------------------------------------------------------------
 Fri May 27 11:47:47 UTC 2011 - lnussel@suse.de
 

rc.syslog

@@ -67,6 +67,12 @@ case "$SYSLOG_DAEMON" in
 	if [ ! -d $ngsocksdir ]; then
 		mkdir -p $ngsocksdir
 	fi
+	test -r "$config" && \
+	while read line; do
+	    case $line in file*/proc/kmsg*)
+		start_klogd=no ; break ;;
+	    esac
+	done < $config
 	;;
     *)
 	syslog=syslogd