[Devil-linux-commit] build/config/etc/init.d syslog,1.10,1.11

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

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

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


Index: syslog
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/syslog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- syslog	6 Nov 2005 10:47:02 -0000	1.10
+++ syslog	12 Jun 2006 02:59:21 -0000	1.11
@@ -28,19 +28,7 @@
 		echo -n "Starting system log daemon"
 		case $SYSLOG_DAEMON in
 		  syslog-ng )
-			# make sure, that all chroot jail entries are removed
-			for I in $(ls /etc/sysconfig/jail)
-			do
-				A=${I##/*/}
-				sed -e "s| unix-stream(\"$JAIL_DIR/$A/dev/log\" max_connections(1000));||" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
-				mv /tmp/tmpfile /etc/syslog-ng/syslog-ng.conf
-			done
-			if [ "$SYSLOG_USER" = "root" ]; then 
-			    syslog-ng 
-			else
-			    syslog-ng -u "$SYSLOG_USER" -g "$SYSLOG_GROUP"
-			fi
-			evaluate_retval
+			loadproc syslog-ng
 			;;
 		  syslogd )
 			loadproc syslogd -a /var/run/log ${SYSLOGD_PARAM}