Accepting request 36797 from home:czanik:branches:Base:System

Copy from home:czanik:branches:Base:System/syslogd via accept of submit request 36797 revision 2.
Request was accepted with message:

OBS-URL: https://build.opensuse.org/request/show/36797
OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=19
This commit is contained in:
Dr. Werner Fink 2010-04-12 10:16:27 +00:00 committed by Git OBS Bridge
parent 259b1d222d
commit c2efc3f858
2 changed files with 17 additions and 0 deletions

View File

@ -61,6 +61,7 @@ case "$SYSLOG_DAEMON" in
syslog=syslog-ng syslog=syslog-ng
config=/etc/syslog-ng/syslog-ng.conf config=/etc/syslog-ng/syslog-ng.conf
params="$SYSLOG_NG_PARAMS" params="$SYSLOG_NG_PARAMS"
ngsocks="/var/run/syslog-ng/additional-log-sockets.conf"
;; ;;
*) *)
syslog=syslogd syslog=syslogd
@ -143,6 +144,9 @@ case "$1" in
touch "$rsocks" touch "$rsocks"
fi fi
;; ;;
(syslog-ng)
echo 'source chroots{' > "$ngsocks"
;;
esac esac
# add additional sockets to params or similar # add additional sockets to params or similar
for variable in ${!SYSLOGD_ADDITIONAL_SOCKET*}; do for variable in ${!SYSLOGD_ADDITIONAL_SOCKET*}; do
@ -154,12 +158,20 @@ case "$1" in
echo "\$AddUnixListenSocket $value" >> "$rsocks" echo "\$AddUnixListenSocket $value" >> "$rsocks"
fi fi
;; ;;
syslog-ng)
echo "unix-dgram(\"$value\");" >> "$ngsocks"
;;
*) *)
params="$params -a $value" params="$params -a $value"
;; ;;
esac esac
} }
done done
case $syslog in
syslog-ng)
echo "};" >> "$ngsocks"
;;
esac
startproc -p ${syslog_pid} ${syslog_bin} ${params} startproc -p ${syslog_pid} ${syslog_bin} ${params}
rc_status rc_status

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 31 20:47:31 CEST 2010
- modify /etc/init.d/syslog for syslog-ng 3.X
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 29 16:48:18 CEST 2010 - werner@suse.de Mon Mar 29 16:48:18 CEST 2010 - werner@suse.de