Author: baggins
Date: Mon Oct 17 16:52:54 2005
New Revision: 6452
Modified:
rc-scripts/trunk/rc.d/init.d/functions
rc-scripts/trunk/rc.d/rc.shutdown
rc-scripts/trunk/sysconfig/system
Log:
- clean solution for initlog/minilogd: RC_LOGGING setting,
and don't log while shutting down
Modified: rc-scripts/trunk/rc.d/init.d/functions
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/functions (original)
+++ rc-scripts/trunk/rc.d/init.d/functions Mon Oct 17 16:52:54 2005
@@ -94,6 +94,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_yes "${RC_LOGGING}" ; then
initlog()
{
RESULT=0
Modified: rc-scripts/trunk/rc.d/rc.shutdown
==============================================================================
--- rc-scripts/trunk/rc.d/rc.shutdown (original)
+++ rc-scripts/trunk/rc.d/rc.shutdown Mon Oct 17 16:52:54 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/trunk/sysconfig/system
==============================================================================
--- rc-scripts/trunk/sysconfig/system (original)
+++ rc-scripts/trunk/sysconfig/system Mon Oct 17 16:52:54 2005
@@ -95,5 +95,8 @@
# Enable cpusets support?
CPUSETS=no
+# Enable syslogging for rc-scripts
+RC_LOGGING=yes
+
# This must be last line !
# vi:syntax=sh:ts=8:sw=4
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
