summaryrefslogtreecommitdiffstats
path: root/initramfs/distro-specs
diff options
context:
space:
mode:
authorDirk von Suchodoletz2006-10-31 18:31:31 +0100
committerDirk von Suchodoletz2006-10-31 18:31:31 +0100
commit1d3b9e8d5c0bb0058106e2fb7e5a2754b6e62a82 (patch)
treed98b0bf88d45badf0577257e6db3cdce1c3fbac5 /initramfs/distro-specs
parent* removed legacy attributes which are managed by external (diff)
downloadcore-1d3b9e8d5c0bb0058106e2fb7e5a2754b6e62a82.tar.gz
core-1d3b9e8d5c0bb0058106e2fb7e5a2754b6e62a82.tar.xz
core-1d3b9e8d5c0bb0058106e2fb7e5a2754b6e62a82.zip
configuration of syslog-ng for SuSE should work now ... (added new
function for writing the config file - sysngwriter in functions) git-svn-id: http://svn.openslx.org/svn/openslx/trunk@499 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/distro-specs')
-rw-r--r--initramfs/distro-specs/suse/functions-default11
-rw-r--r--initramfs/distro-specs/ubuntu/functions-default15
2 files changed, 12 insertions, 14 deletions
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default
index c9301e75..931cb711 100644
--- a/initramfs/distro-specs/suse/functions-default
+++ b/initramfs/distro-specs/suse/functions-default
@@ -96,14 +96,9 @@ fi
config_syslog () {
if [ "x$start_syslog" != "xno" ] ; then
if [ -f /mnt/etc/${D_INITDIR}/syslog ] ; then
- # how to configure remote log server?
- # logging servers might be specified in $log_servers (from e.g. dhcp)
- echo -e "# File modified by $0 within InitRamFS" \
- > /etc/syslog-ng.conf
- sed -e "s,.*dhcp/dev.*,,;s,.*named/dev.*,," \
- /mnt/etc/syslog-ng/syslog-ng.conf >> /etc/syslog-ng.conf
- cp /etc/syslog-ng.conf /mnt/etc/syslog-ng/syslog-ng.conf
- rllinker syslog "02" "20"
+ # logoutput depending on $start_syslog definitions
+ sysngwriter /mnt/etc/syslog-ng/syslog-ng.conf
+ rllinker syslog "02" "20"
else
error "$df_errsysl" nonfatal
fi
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index 0310d1c7..13eb7f14 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -138,19 +138,22 @@ fi
# syslog service
config_syslog () {
-if [ "x$start_syslog" = "xyes" ] ; then
+if [ "x$start_syslog" != "xno" ] ; then
+# fixme, welcher Syslog wird verwendet?
+#if syslog
testmkd /mnt/var/log/news
echo -e "# /etc/syslog.conf - file generated by $0" >/mnt/etc/syslogd.conf
- echo "kern.warn;*.err;authpriv.none\t/dev/tty10\n\
-#kern.warn;*.err;authpriv.none\t|/dev/xconsole\n\
-#*.emerg\n\n*.=warn;*.=err\t\t\t-/var/log/warn\n\
-#*.crit\t\t\t\t/var/log/warn\n*.*;mail.none;news.none\t\t\
-#-/var/log/messages" >> /mnt/etc/syslogd.conf
# test -n "$log_servers" && \
# for logserver in $log_servers; do
# echo -e "*.*;*.*;*.*;*kern.!*\t@$logserver" >>/mnt/etc/syslog.conf
# done
+#else syslog-ng
+# if [ -f /mnt/etc/${D_INITDIR}/syslog ] ; then
+# # logoutput depending on $start_syslog definitions
+# sysngwriter /mnt/etc/syslog-ng/syslog-ng.conf
rllinker "sysklogd" "02" "18"
+#else keiner installiert
+# error "$df_errsysl" nonfatal
fi
}