diff options
author | Oliver Tappe | 2008-03-24 20:08:13 +0100 |
---|---|---|
committer | Oliver Tappe | 2008-03-24 20:08:13 +0100 |
commit | 986edf8583a69376055802b5e99147354f17762a (patch) | |
tree | b8526001f71a52c0756031b1e12c9c144b1c97a5 /os-plugins/plugins/syslog/init-hooks | |
parent | * getInstalledPackages() has to fetch the info from the packager, not the (diff) | |
download | core-986edf8583a69376055802b5e99147354f17762a.tar.gz core-986edf8583a69376055802b5e99147354f17762a.tar.xz core-986edf8583a69376055802b5e99147354f17762a.zip |
* split syslog::target into syslog::host and syslog::port
* implemented stage3 backend for syslog-ng (syslogd still missing)
* added another hook-script that:
+ stops busybox syslogd (in order to be superseded by native syslog daemon)
+ removes boot.klog if it exists (as it will hang, most probably since we
have already emptied the kernel message log)
With these changes, I have successfully tested remote syslog for a suse-10.2 vendor-OS.
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1684 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins/syslog/init-hooks')
-rw-r--r-- | os-plugins/plugins/syslog/init-hooks/15-have-ip-config/syslog.sh | 7 | ||||
-rw-r--r-- | os-plugins/plugins/syslog/init-hooks/95-cleanup/syslog.sh | 10 |
2 files changed, 14 insertions, 3 deletions
diff --git a/os-plugins/plugins/syslog/init-hooks/15-have-ip-config/syslog.sh b/os-plugins/plugins/syslog/init-hooks/15-have-ip-config/syslog.sh index 8c6218cc..3ce3ca04 100644 --- a/os-plugins/plugins/syslog/init-hooks/15-have-ip-config/syslog.sh +++ b/os-plugins/plugins/syslog/init-hooks/15-have-ip-config/syslog.sh @@ -1,7 +1,8 @@ if [ -e /initramfs/plugin-conf/syslog.conf ]; then . /initramfs/plugin-conf/syslog.conf - if [ $syslog_active -ne 0 ]; then - echo "syslogd -R $syslog_target..." - syslogd -R $syslog_target & >/dev/null 2>&1 + if [ $syslog_active -ne 0 ] && [ -n "$syslog_host" ]; then + echo "syslogd -R ${syslog_host}:${syslog_port}..." + syslogd -R "${syslog_host}:${syslog_port}" & >/dev/null 2>&1 + klogd >/dev/null 2>&1 fi fi diff --git a/os-plugins/plugins/syslog/init-hooks/95-cleanup/syslog.sh b/os-plugins/plugins/syslog/init-hooks/95-cleanup/syslog.sh new file mode 100644 index 00000000..3e112ff7 --- /dev/null +++ b/os-plugins/plugins/syslog/init-hooks/95-cleanup/syslog.sh @@ -0,0 +1,10 @@ +if [ -e /initramfs/plugin-conf/syslog.conf ]; then + . /initramfs/plugin-conf/syslog.conf + if [ $syslog_active -ne 0 ] && [ -n "$syslog_host" ]; then + # kill syslogd, as it is going to be replaced by system's syslog soon + killall syslogd + # remove links to boot.klog, as that will hang (I suppose that is + # because we already emptied /dev/kmsg) + rm /mnt/etc/init.d/boot.d/*.klog + fi +fi |