[Devil-linux-commit] build/scripts/scripts upgrade-config, 1.26, 1.27

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23756/scripts/scripts

Modified Files:
	upgrade-config 
Log Message:
use upgrade-config to convert to the new syslog way


Index: upgrade-config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/upgrade-config,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- upgrade-config	5 Apr 2006 19:52:41 -0000	1.26
+++ upgrade-config	12 Jun 2006 02:59:21 -0000	1.27
@@ -124,7 +124,7 @@
 	comparesubstr "$f" "etc/init.d/" && onoff="off"
 	comparesubstr "$f" "etc/init.d/firewall.rules" && onoff="on"
 	comparesubstr "$f" "etc/init.d/boot.local" && onoff="on"
-	finfo=$(ls -la $f)
+	finfo=$(ls -a $f)
 	cmp -s $f newconfig/$f || echo $f \"\" $onoff \"$finfo\" >> $TMPD
 done
 
@@ -298,4 +298,18 @@
 sed -e s%"si::sysinit:/etc/init.d/boot"%"si::sysinit:/etc/init.d/rc boot"% newconfig/etc/inittab > newconfig/etc/inittab.new
 mv -f newconfig/etc/inittab.new newconfig/etc/inittab
 
+# syslog-ng
+# make sure, that all chroot jail entries are removed
+for I in $(ls newconfig/etc/sysconfig/jail)
+do
+    A=${I##/*/}
+    sed -e "s| unix-stream(\"$JAIL_DIR/$A/dev/log\" max-connections(1000));||" < newconfig/etc/syslog-ng/syslog-ng.conf > $TMPD
+    mv $TMPD newconfig/etc/syslog-ng/syslog-ng.conf
+done
+
+# syslog-ng
+# replace stream with dgram
+sed -e "s|unix-stream(\"/dev/log\"|unix-dgram(\"/dev/log\"|" < newconfig/etc/syslog-ng/syslog-ng.conf > $TMPD
+mv $TMPD newconfig/etc/syslog-ng/syslog-ng.conf
+
 rm -fr $TMPD $RESULT