From ba66aa63c98a731d6a8d2cc71a7008a7cacc48b0 Mon Sep 17 00:00:00 2001
From: Bastian Wissler
Date: Wed, 14 Jan 2009 10:50:53 +0000
Subject: initramfs:     * Changed init to support syslog-plugin and debug=3
 with syslog caps

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2477 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/stage3-stuff/init | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'initramfs/stage3-stuff/init')

diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init
index f2ba45a5..d2eeb529 100755
--- a/initramfs/stage3-stuff/init
+++ b/initramfs/stage3-stuff/init
@@ -160,11 +160,10 @@ in $0\ncountry=\"${COUNTRY}\"" >>/etc/initramfs-setup
         echo "Syslogd started on third console (tty3)"
         # just to have some name in syslog
         echo "(slx init)" >/proc/sys/kernel/hostname
-        #syslogd -C2048
-        syslogd #-O /var/log/messages
+        syslogd -C2048
 	klogd
-        #logread -f > /dev/tty3 2>/dev/null &
-        #logread -f >> /var/log/messages 2>/dev/null &
+        logread -f > /dev/tty3 2>/dev/null &
+        logread -f >> /var/log/messages 2>/dev/null &
       fi
     ;;
     # if configuration should not be gathered by dhcp client
@@ -925,8 +924,9 @@ chmod 1777 /mnt/dev/shm /mnt/tmp 2>/dev/null
 
 runinithook '95-cleanup'
 
-# kill hwautocfg, servconfig, hwinfo
-killall -9 hwautocfg servconfig debugshell hwinfo 2>/mnt/dev/null
+# kill hwautocfg, servconfig, hwinfo, syslogd, etc.
+killall -9 hwautocfg servconfig debugshell hwinfo \
+	syslogd logread 2>/mnt/dev/null
 # runtimer
 [ $DEBUGLEVEL -eq 8 -o $DEBUGLEVEL -eq 20 ] && \
   echo "** SLX init ended near $(sysup)"
@@ -936,11 +936,13 @@ killall -9 hwautocfg servconfig debugshell hwinfo 2>/mnt/dev/null
 # (if exists)
 killall klogd 2>/dev/null
 [ -f /var/log/slx-boot.log ] && mv /var/log/slx-boot.log \
-  /mnt/var/log/slx-s3boot.log && cp /var/log/messages \
-  /mnt/var/log/messages 2>/dev/null
+  /mnt/var/log/slx-s3boot.log
+[ -f /var/log/messages ] && cp /var/log/messages \
+  /mnt/var/log/slx_messages 2>/dev/null
 # if no syslog plugin was configured, start the daemon again writing to no
 # logfile directly (useless fake test as placeholder) 
-[ ! -d /mnt/opt/openslx/plugin-repo/syslog/ ] && syslogd -O /mnt/var/log/testfile
+# THIS IS NOT WORKING SOMEHOW!!
+#[ ! -d /mnt/opt/openslx/plugin-repo/syslog/ ] && syslogd -O /mnt/var/log/testfile
 
 # move /dev and unmount /proc and unset all old, unneeded environment
 # variables
-- 
cgit v1.2.3-55-g7522