First changes for syslog (URI format possible in variable syslog, see

''machine-setup''), fallback in init if no kernel-version is passed ...


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

3 files changed, 15 insertions, 7 deletions

diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default
index 1882218b..c9301e75 100644
--- a/initramfs/distro-specs/suse/functions-default
+++ b/initramfs/distro-specs/suse/functions-default
@@ -3,10 +3,10 @@
 # inclusion of the main functions file). This file is the main base for the
 # several SuSE distro versions
 #
-# Dirk von Suchodoletz <dvs@OpenSLX.com>, 07-10-2006
+# Dirk von Suchodoletz <dvs@OpenSLX.com>, 29-10-2006
 #
 # (c) 2006 - RZ Universitaet Freiburg
-# (c) 2006 OpenSLX.org Project
+# (c) 2006 OpenSLX.ORG Project
 
 # empty functions are defined at the beginning of /etc/functions
 
@@ -92,13 +92,13 @@ if [ "x$start_cron" = "xyes" ] ; then
 fi
 }
 
-# syslog service
+# syslog service (different syslogs might be present)
 config_syslog () {
-if [ "x$start_syslog" = "xyes" ] ; then
+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 initial ramdisk" \
+    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
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index dc61fa25..7b20d904 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -47,6 +47,12 @@ mkdir -p ${DEVDIR}/.udevdb
 # redirect console (after /dev/console is available, and /dev mounted)
 exec < /dev/console > /dev/console 2>&1
 
+# if no kernel version is set, try to get it directly from /proc
+if [ -z $KERNEL ] ; then
+  KERNEL=$(cat /proc/version)
+  KERNEL=${KERNEL#*version }
+  KERNEL=${KERNEL% (*) (*}
+fi
 # set defaults for some important variables, might be overwritten via
 # kernel commandline
 TMPFSSIZE="50%"
diff --git a/installer/default_files/machine-setup.default b/installer/default_files/machine-setup.default
index 2de3019f..603a7668 100644
--- a/installer/default_files/machine-setup.default
+++ b/installer/default_files/machine-setup.default
@@ -52,7 +52,9 @@ start_sshd="yes"
 # start rwhod service (lan wide login and uptime list)
 start_rwhod="no"
 
-# start log server (remote log servers could be passed via dhcp option)
+# 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"
 start_syslog="yes"
 
 # start cron service
@@ -64,7 +66,7 @@ start_atd="no"
 # simple network management protocol for system monitoring
 start_snmp="no"
 
-# dbus, resource manager , hal (hardware abstraction layer) interoperate
+# dbus, resource manager, hal (hardware abstraction layer) interoperate
 # tighly. There might be little different solutions within each distro
 start_dreshal="yes"