Update of /cvsroot/devil-linux/build/config/etc/init.d
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4250/config/etc/init.d
Modified Files:
jail syslog
Log Message:
- updated sysstat to v5.0.4
- updated quota-tools v3.12
- updated psmisc to v21.5
- syslog-ng doesn't use klogd anymore, we access /proc/kmsg directly
- added better support for chroot jail when using syslogd (Heiko + Peter
Jannesen)
Index: syslog
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/syslog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- syslog 20 May 2004 01:06:37 -0000 1.7
+++ syslog 26 May 2004 01:03:18 -0000 1.8
@@ -27,7 +27,7 @@
start )
echo -n "Starting system log daemon"
case $SYSLOG_DAEMON in
- syslog-ng )
+ syslog-ng )
# make sure, that all chroot jail entries are removed
for I in $(ls /etc/sysconfig/jail)
do
@@ -37,18 +37,18 @@
done
loadproc syslog-ng
;;
- syslogd )
- loadproc syslogd
+ syslogd )
+ loadproc syslogd -a /var/run/log ${SYSLOGD_PARAM}
+ echo -n "Starting kernel log daemon"
+ loadproc klogd -c $KERNEL_LOGLEVEL
;;
- *)
+ *)
$FAILURE
echo unkown SYSLOG Daemon
echo please check SYSLOG_DAEMON in /etc/sysconfig/config
$NORMAL
;;
esac
- echo -n "Starting kernel log daemon"
- loadproc klogd -c $KERNEL_LOGLEVEL
;;
stop )
@@ -59,6 +59,8 @@
;;
syslogd )
killproc syslogd
+ echo -n "Stopping kernel log daemon"
+ killproc klogd
;;
*)
$FAILURE
@@ -67,8 +69,6 @@
$NORMAL
;;
esac
- echo -n "Stopping kernel log daemon"
- killproc klogd
;;
restart)
Index: jail
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/jail,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- jail 20 May 2004 01:06:24 -0000 1.26
+++ jail 26 May 2004 01:03:18 -0000 1.27
@@ -252,12 +252,29 @@
echo -n "."
#echo "adding syslog support"
- 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
+
+ case $SYSLOG_DAEMON in
+ syslog-ng )
+ 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
+ ;;
+
+ syslogd )
+ ln -f /var/run/log $JAILDIR/dev/log
+ ;;
+
+ *)
+ $FAILURE
+ echo unkown SYSLOG Daemon
+ echo please check SYSLOG_DAEMON in /etc/sysconfig/config
+ $NORMAL
+ ;;
+ esac
/etc/init.d/syslog reload
+
print_status success
if [ -n "$DAEMON" ]; then
@@ -266,9 +283,21 @@
fi
;;
stop )
- 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
+ case $SYSLOG_DAEMON in
+ syslog-ng )
+ 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
+ ;;
+
+ *)
+ $FAILURE
+ echo unkown SYSLOG Daemon
+ echo please check SYSLOG_DAEMON in /etc/sysconfig/config
+ $NORMAL
+ ;;
+ esac
/etc/init.d/syslog reload
+
# parse jail file
grep -v "^#" $JAIL_DEF | grep -v ^$ > /tmp/.jailtmp
while read COMMAND PARAM; do
|
