[Devil-linux-commit] build/config/etc/init.d boot,1.27,1.28 syslog,1.8,1.9

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

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

Modified Files:
	boot syslog 
Log Message:
- replace the udev config files with our own ( based on Linux from Scratch)
- first preparations to run syslog-ng now under the user syslog (can be
changed via /etc/sysconfig/config)


Index: syslog
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/syslog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- syslog	26 May 2004 01:03:18 -0000	1.8
+++ syslog	24 Jan 2005 00:35:19 -0000	1.9
@@ -35,7 +35,12 @@
 				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
+			if [ "$SYSLOG_USER" = "root" ]; then 
+			    syslog-ng 
+			else
+			    syslog-ng -u "$SYSLOG_USER" -g "$SYSLOG_GROUP"
+			fi
+			evaluate_retval
 			;;
 		  syslogd )
 			loadproc syslogd -a /var/run/log ${SYSLOGD_PARAM}

Index: boot
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/boot,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- boot	23 Jan 2005 21:05:11 -0000	1.27
+++ boot	24 Jan 2005 00:35:19 -0000	1.28
@@ -39,6 +39,10 @@
 cat /proc/mounts > /etc/mtab
 print_status success
 
+# let's get rid of some leftovers
+rm /etc/udev/rules.d/50*
+rm /etc/udev/permissions.d/50*
+
 echo -n "Creating devices in /dev"
 /sbin/udevstart
 print_status success