Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23035/scripts/scripts
Modified Files:
Tag: rel-1-2-patches
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.22.2.5
retrieving revision 1.22.2.6
diff -u -d -r1.22.2.5 -r1.22.2.6
--- upgrade-config 5 Apr 2006 19:33:55 -0000 1.22.2.5
+++ upgrade-config 12 Jun 2006 02:58:26 -0000 1.22.2.6
@@ -232,8 +232,6 @@
fi
done
-pause
-
echo
if askyesno "/etc/sysconfig/config migration" "Do you want to migrate old values to your new /etc/sysconfig/config ?" yes
then
@@ -253,8 +251,6 @@
done
fi
-pause
-
if askyesno "User and Group migration" "Do you want to migrate your old users, groups and passwords?" yes ; then
migrateid ()
{
@@ -302,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
|
