- clean solution for initlog/minilogd: RC_LOGGING setting,

  and don't log while shutting down

svn-id: @6452

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index e2cd7095b341c822f5790246d8d464693216fc4b..822ef6ff5cca4410bc5acb460b3ed4f5de5e6a28 100644 (file)
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -94,6 +94,10 @@ is_no()
 
 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

diff --git a/rc.d/rc.shutdown b/rc.d/rc.shutdown
index bb2056b871876fe847636a376dcb6b55cc3d3902..b75f6b689dad9450d71b09efa862540bbd8a7c85 100755 (executable)
--- a/rc.d/rc.shutdown
+++ b/rc.d/rc.shutdown
@@ -14,6 +14,8 @@ PATH=/sbin:/bin:/usr/bin:/usr/sbin
 # move to root dir
 cd /
 
+IN_SHUTDOWN=yes
+
 . /etc/rc.d/init.d/functions
 
 # avoid keyboard interruption

diff --git a/sysconfig/system b/sysconfig/system
index 2040583b72e4961fa59bbe68afe8335b864985dc..28c3b0de2691eb459f0872eb9d1e33c20446f046 100644 (file)
--- a/sysconfig/system
+++ b/sysconfig/system
@@ -95,5 +95,8 @@ PROMPT=yes
 # 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