diff options
author | Oliver Tappe | 2008-03-24 20:15:30 +0100 |
---|---|---|
committer | Oliver Tappe | 2008-03-24 20:15:30 +0100 |
commit | bf06f9dd643ded8741c7e5bd3786dc2aefb7d3af (patch) | |
tree | cf39dc0c99c7b1d1ad424ac468e1c7ff12681d54 /os-plugins/plugins/syslog/init-hooks | |
parent | * fileget can't run in the background, in order to allow to use it's result (diff) | |
download | core-bf06f9dd643ded8741c7e5bd3786dc2aefb7d3af.tar.gz core-bf06f9dd643ded8741c7e5bd3786dc2aefb7d3af.tar.xz core-bf06f9dd643ded8741c7e5bd3786dc2aefb7d3af.zip |
* corrected indenting of 'syslog'-related shell scripts
* only try to remove boot.klog links if such an init script exists at all
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1686 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 | 12 | ||||
-rw-r--r-- | os-plugins/plugins/syslog/init-hooks/95-cleanup/syslog.sh | 16 |
2 files changed, 15 insertions, 13 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 3ce3ca04..4003a0a4 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,8 +1,8 @@ if [ -e /initramfs/plugin-conf/syslog.conf ]; then - . /initramfs/plugin-conf/syslog.conf - 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 + . /initramfs/plugin-conf/syslog.conf + 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 index 3e112ff7..08076c34 100644 --- a/os-plugins/plugins/syslog/init-hooks/95-cleanup/syslog.sh +++ b/os-plugins/plugins/syslog/init-hooks/95-cleanup/syslog.sh @@ -1,10 +1,12 @@ 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 + . /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) + if [ -e /mnt/etc/init.d/boot.klog ]; then + rm /mnt/etc/init.d/boot.d/*.klog fi + fi fi |