rename option to RC_UPTIME and add to default config

svn-id: @12678

diff --git a/lib/functions b/lib/functions
index 75f0de3f66ed8e53f76669287db8ce36ff5792e5..4658d6f08a178fc51c35b1573d5b9972b626a1bf 100644 (file)
--- a/lib/functions
+++ b/lib/functions
@@ -394,7 +394,7 @@ msg_usage() {
 show() {
        local text len time
 
-       if is_yes "$RC_BOOTTIME"; then
+       if is_yes "$RC_UPTIME"; then
                time=$(awk '{printf("[%8.2f] ", $1)}' /proc/uptime)
        fi
 

diff --git a/sysconfig/system b/sysconfig/system
index c5c8f1c6447e9bed52eb3565193eb2b6dc6f88a4..57bf20d2b5052ae5dabee9c0e10e65b25dbdc58a 100644 (file)
--- a/sysconfig/system
+++ b/sysconfig/system
@@ -124,5 +124,8 @@ VSERVER_ISOLATION_NET=detect
 # Enable syslogging for rc-scripts
 RC_LOGGING=yes
 
+# Include machine uptime counter in all show messages
+RC_UPTIME=no
+
 # Disable console logging by blogd
 RC_BOOTLOG=yes