[Devil-linux-commit] build/config/etc/init.d jail,1.21.2.2,1.21.2.3 syslog,1.5.2.1,1.5.2.2

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

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

Modified Files:
      Tag: rel-1-0-patches
	jail syslog 
Log Message:
- fixed a bug in the syslog-ng.conf file which causes /dev/log to be closed
  during a reload command (use stream instead of dgram)


Index: syslog
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/syslog,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- syslog	13 Mar 2004 15:07:53 -0000	1.5.2.1
+++ syslog	20 May 2004 00:44:10 -0000	1.5.2.2
@@ -32,7 +32,7 @@
 			for I in $(ls /etc/sysconfig/jail)
 			do
 				A=${I##/*/}
-				sed -e "s| unix-dgram(\"$JAIL_DIR/$A/dev/log\");||" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
+				sed -e "s| unix-stream(\"$JAIL_DIR/$A/dev/log\");||" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
 				mv /tmp/tmpfile /etc/syslog-ng/syslog-ng.conf
 			done
 			loadproc syslog-ng

Index: jail
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/jail,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.3
diff -u -d -r1.21.2.2 -r1.21.2.3
--- jail	26 Dec 2003 14:45:57 -0000	1.21.2.2
+++ jail	20 May 2004 00:44:10 -0000	1.21.2.3
@@ -252,8 +252,8 @@
 		echo -n "."
 
 		#echo "adding syslog support"
-		if [ -z "$(grep "unix-dgram(\"$JAILDIR/dev/log\");" /etc/syslog-ng/syslog-ng.conf)" ]; then
-			sed -e "s|^source src {|source src { unix-dgram(\"$JAILDIR/dev/log\");|" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
+		if [ -z "$(grep "unix-stream(\"$JAILDIR/dev/log\");" /etc/syslog-ng/syslog-ng.conf)" ]; then
+			sed -e "s|^source src {|source src { unix-stream(\"$JAILDIR/dev/log\");|" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
 			mv /tmp/tmpfile /etc/syslog-ng/syslog-ng.conf
 		fi
 		/etc/init.d/syslog reload
@@ -266,7 +266,7 @@
 		fi
 		;;
 	stop )
-		sed -e "s| unix-dgram(\"$JAILDIR/dev/log\");||" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
+		sed -e "s| unix-stream(\"$JAILDIR/dev/log\");||" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
 		mv /tmp/tmpfile /etc/syslog-ng/syslog-ng.conf
 		/etc/init.d/syslog reload
 		# parse jail file