sysconfig/clock and related actions are obsolete now. hwclock knows how to handle...

svn-id: @12089

diff --git a/doc/sysconfig.docb b/doc/sysconfig.docb
index 15ce85a751dbd213b2d20dcf6f777317346a9148..bf57e99fed330152d61e4998cd888523f71bd64c 100644 (file)
--- a/doc/sysconfig.docb
+++ b/doc/sysconfig.docb
@@ -3,42 +3,6 @@
     <refname>/etc/sysconfig/</refname>
     <refpurpose>Basic system settings</refpurpose>
   </refnamediv>
-  <refsect1>
-    <title><filename moreinfo="None">/etc/sysconfig/clock</filename></title>
-    <refsect2>
-      <title>Deprecated values from earlier releases:</title>
-      <variablelist>
-       <varlistentry>
-         <term>CLOCKMODE=GMT</term>
-         <listitem><para>indicates that the clock is set to UTC</para></listitem>
-       </varlistentry>
-       <varlistentry>
-         <term>CLOCKMODE=ARC</term>
-         <listitem><para>on alpha only indicates the ARC console's
-             42-year time offset is in effect</para>
-         </listitem>
-       </varlistentry>
-      </variablelist>
-    </refsect2>
-    <refsect2>
-      <title>Currently correct values:</title>
-      <variablelist>
-       <varlistentry>
-         <term>UTC=true</term>
-         <listitem><para>indicates that the clock is set to UTC; anything
-             else indicates that it is set to local time</para>
-         </listitem>
-       </varlistentry>
-       <varlistentry>
-         <term>ARC=true</term>
-         <listitem><para>on alpha only indicates the ARC console's
-             42-year time offset is in effect; otherwise the normal
-             Unix epoch is assumed</para>
-         </listitem>
-       </varlistentry>
-      </variablelist>
-    </refsect2>
-  </refsect1>
   <refsect1>
     <title><filename moreinfo="None">/etc/sysconfig/keyboard</filename></title>
     <variablelist>

diff --git a/doc/sysconfig.txt b/doc/sysconfig.txt
index 4685c119d7014fb371a5c14ca22e8362cda33a2c..d396229862eae1a778cc07494a4f04e67bfafb00 100644 (file)
--- a/doc/sysconfig.txt
+++ b/doc/sysconfig.txt
@@ -3,23 +3,6 @@ $Id$
 Files in /etc/sysconfig
 =======================
 
-/etc/sysconfig/clock:
-
-  deprecated values from earlier releases:
-
-    CLOCKMODE=GMT indicates that the clock is set to UTC
-    CLOCKMODE=ARC on alpha only indicates the ARC console's
-      42-year time offset is in effect
-
-  currently correct values:
-
-    UTC=true indicates that the clock is set to UTC; anything
-      else indicates that it is set to local time
-    ARC=true on alpha only indicates the ARC console's
-      42-year time offset is in effect; otherwise the normal
-      Unix epoch is assumed
-
-
 /etc/sysconfig/keyboard:
 
   KEYTABLE=<keytable file>

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 79f11c78c2bed8aaa5b2f40fb86f597fe575a040..4a7b960b95aa79be4e7c1dc64e444052e114ca73 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -289,50 +289,9 @@ if ! is_yes "$VSERVER"; then
        # may be missing).
        sysctl -e -p /etc/sysctl.conf > /dev/null 2>&1
 
-       # Set the system clock.
-       ARC=0
-       SRM=0
-       UTC=0
-
-       if [ -f /etc/sysconfig/clock ]; then
-               . /etc/sysconfig/clock
-
-               # convert old style clock config to new values
-               if [ "${CLOCKMODE}" = "GMT" ]; then
-                       UTC=true
-               elif [ "${CLOCKMODE}" = "ARC" ]; then
-                       ARC=true
-               fi
-       fi
-
-       if grep "system serial" /proc/cpuinfo 2>/dev/null | grep -q MILO 2>/dev/null ; then
-               ARC=true
-       fi
-
-       CLOCKDEF=""
-       CLOCKFLAGS="--hctosys"
-
-       if is_yes "$UTC" ; then
-               CLOCKFLAGS="$CLOCKFLAGS --utc"
-               CLOCKDEF="$CLOCKDEF (utc)"
-       else
-               CLOCKFLAGS="$CLOCKFLAGS --localtime"
-               CLOCKDEF="$CLOCKDEF (local)"
-       fi
-
-       if is_yes "$ARC" ; then
-               CLOCKFLAGS="$CLOCKFLAGS -A"
-               CLOCKDEF="$CLOCKDEF (arc)"
-       fi
-
-       if is_yes "$SRM" ; then
-               CLOCKFLAGS="$CLOCKFLAGS -S"
-               CLOCKDEF="$CLOCKDEF (srm)"
-       fi
-
        # Check if timezone definition is available
        if [ -e /etc/localtime ] && [ -e /dev/rtc -o -e /dev/rtc0 ] ; then
-               if run_cmd "$(nls 'Setting clock')$CLOCKDEF" hwclock $CLOCKFLAGS; then
+               if run_cmd "$(nls 'Setting clock')" hwclock --hctosys; then
                        show "$(nls 'Today`s date:') $(LC_CTYPE=C date)"; ok
                fi
        else
@@ -919,7 +878,7 @@ if ! is_yes "$VSERVER"; then
 
        # Set the clock if timezone definition wasn't available (eg. /usr not mounted)
        if is_yes "$TIME_SETUP_DELAYED" && [ -e /dev/rtc -o -e /dev/rtc0 ]; then
-               if run_cmd "$(nls 'Setting clock')$CLOCKDEF" hwclock $CLOCKFLAGS; then
+               if run_cmd "$(nls 'Setting clock')" hwclock --hctosys; then
                        show "$(nls 'Today`s date:') $(LC_CTYPE=C date)"; ok
                fi
        fi

diff --git a/sysconfig/clock b/sysconfig/clock
deleted file mode 100644 (file)
index c569792..0000000
--- a/sysconfig/clock
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-# Should the hardware clock be kept in Coordinated Universal Time
-# (instead of local time).
-UTC=true
-# true means your machine uses epoch 1980 in its hardware clock
-ARC=false
-# true means your machine uses epoch 1900 in its hardware clock
-SRM=false