rc-scripts/branches/vserver: rc.d/init.d/functions rc.d/rc.shutdown sysconfig/system

[baggins]

Author: baggins
Date: Mon Oct 17 17:07:10 2005
New Revision: 6455

Modified:
   rc-scripts/branches/vserver/rc.d/init.d/functions
   rc-scripts/branches/vserver/rc.d/rc.shutdown
   rc-scripts/branches/vserver/sysconfig/system
Log:
- clean solution for initlog/minilogd: RC_LOGGING setting,
  and don't log while shutting down


Modified: rc-scripts/branches/vserver/rc.d/init.d/functions
==============================================================================
--- rc-scripts/branches/vserver/rc.d/init.d/functions	(original)
+++ rc-scripts/branches/vserver/rc.d/init.d/functions	Mon Oct 17 17:07:10 2005
@@ -93,6 +93,10 @@
 
 if is_yes "$FASTRC"; then
 	INIT_DOTS=$(awk "BEGIN{for(\$i=0;\$i<$INIT_COL;\$i++)printf(\".\");}")
+	RC_LOGGING=no
+fi
+
+if is_yes "${IN_SHUTDOWN}" || is_no "${RC_LOGGING}" ; then
 	initlog()
 	{
 		RESULT=0

Modified: rc-scripts/branches/vserver/rc.d/rc.shutdown
==============================================================================
--- rc-scripts/branches/vserver/rc.d/rc.shutdown	(original)
+++ rc-scripts/branches/vserver/rc.d/rc.shutdown	Mon Oct 17 17:07:10 2005
@@ -14,6 +14,8 @@
 # move to root dir
 cd /
 
+IN_SHUTDOWN=yes
+
 . /etc/rc.d/init.d/functions
 
 # avoid keyboard interruption

Modified: rc-scripts/branches/vserver/sysconfig/system
==============================================================================
--- rc-scripts/branches/vserver/sysconfig/system	(original)
+++ rc-scripts/branches/vserver/sysconfig/system	Mon Oct 17 17:07:10 2005
@@ -42,5 +42,8 @@
 # Run /sbin/ldconfig at startup ?
 RUN_LDCONFIG=no
 
+# Enable syslogging for rc-scripts
+RC_LOGGING=no
+
 # This must be last line !
 # vi:syntax=sh:ts=8:sw=4