[Devil-linux-commit] build/scripts/scripts upgrade-config, 1.22.2.8, 1.22.2.9

[Bruce S. <bl...@us...>]

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

Modified Files:
      Tag: rel-1-2-patches
	upgrade-config 
Log Message:
Fix syslog-ng.conf modifications.


Index: upgrade-config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/upgrade-config,v
retrieving revision 1.22.2.8
retrieving revision 1.22.2.9
diff -u -d -r1.22.2.8 -r1.22.2.9
--- upgrade-config	6 Jul 2006 18:39:34 -0000	1.22.2.8
+++ upgrade-config	6 Jul 2006 19:58:50 -0000	1.22.2.9
@@ -300,17 +300,10 @@
 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
+# remove all chroot jail entries and replace stream with dgram
+sed	-e 's|unix-stream *( *"/jail[^;]*;||g' \
+	-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