Small fix for output of syslog-ng.conf, comments ...

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@500 95ad53e4-c205-0410-b2fa-d234c58c8868

3 files changed, 15 insertions, 15 deletions

diff --git a/initramfs/distro-specs/debian/functions-default b/initramfs/distro-specs/debian/functions-default
index 5b15c920..573950ae 100644
--- a/initramfs/distro-specs/debian/functions-default
+++ b/initramfs/distro-specs/debian/functions-default
@@ -1,13 +1,11 @@
-# Description:  configuration script for general Debian to configure
-#		linux diskless clients (executed within initial
-#		ramdisk after genconfig) 
+# configuration script for general Debian to configure linux diskless clients
+# (executed within initialramfs after genconfig) 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 23-06-2006
-#		Felix Endres, 30-04-2006
+# Dirk von Suchodoletz <dirk@goe.net>, 31-10-2006
+# Felix Endres, 30-04-2006
 #
-# Copyright:    (c) 2006 - RZ Universitaet Freiburg
-# 
-# Version:      0.3.0a
+# (c) 2006 - RZ Universitaet Freiburg
+# (c) 2006 - OpenSLX.ORG Project
 
 # empty functions are defined at the beginning of /etc/functions
 
@@ -131,8 +129,8 @@ fi
 
 # syslog service
 config_syslog () {
-if [ "x$start_syslog" = "xyes" ] ; then
-  :
+if [ "x$start_syslog" != "xno" ] ; then
+  : # fixme: Evtl. Verzweigung fuer syslog/-ng Varianten, siehe Ubuntu
 fi
 }
 
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index 4cb18574..bf8aff1f 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -495,15 +495,14 @@ syslogngcfg=$1
 echo -e "# File written by $0 within InitRamFS\n\
 source src {\n\tfile(\"/proc/kmsg\") log_prefix(\"kernel: \");\n\
 \tunix-stream(\"/dev/log\");\n\tinternal();\n};\ndestination console_all {\
-file(\"/dev/tty10\"); };" >$syslogngcfg
+\n\tfile(\"/dev/tty10\");\n};" >$syslogngcfg
 case "$start_syslog" in
   yes|Yes|YES)
     : # already defined
   ;;
   file)
-    echo -e "destination allmessages { file(\"/var/log/allmessages\"); };\n\
-log { source(src); destination(allmessages); };" \
-      >>$syslogngcfg
+    echo -e "destination allmessages {\n\tfile(\"/var/log/allmessages\");\n};\
+\nlog {\n\tsource(src); destination(allmessages);\n};" >>$syslogngcfg
   ;;
   *)
     syslogsrv=$(uri_token $start_syslog server)
diff --git a/installer/default_files/machine-setup.default b/installer/default_files/machine-setup.default
index 603a7668..b187a514 100644
--- a/installer/default_files/machine-setup.default
+++ b/installer/default_files/machine-setup.default
@@ -55,6 +55,9 @@ start_rwhod="no"
 # start log server (remote log servers could be either passed via dhcp option
 # or by giving the server URI instead of yes. udp and tcp are possible)
 # start_syslog="syslog://@@@serverip@@@:port/udp"
+# syslog to file (standard location depending on distribution)
+# start_syslog="file"
+# setting syslog to yes, info is written to console 10
 start_syslog="yes"
 
 # start cron service
@@ -82,7 +85,7 @@ netbios_workgroup="dxs-network"
 # if openslx server and server for the home is the same machine, you can
 # use @@@serverip@@@ instead of a fixed setting here
 #automnt_dir="/home"
-#automnt_src="serverip/home"
+#automnt_src="(proto://)serverip/home"
 
 # scratch space on server "proto://serverip/slx/tmp"
 # if openslx server and server for the remote rw scratch is the same