SVN: rc-scripts/trunk: doc/sysconfig.docb doc/sysconfig.txt rc.d/rc.sysinit sysconfig/clock

[arekm]

Author: arekm
Date: Thu Jan 27 07:02:13 2011
New Revision: 12089

Removed:
   rc-scripts/trunk/sysconfig/clock
Modified:
   rc-scripts/trunk/doc/sysconfig.docb
   rc-scripts/trunk/doc/sysconfig.txt
   rc-scripts/trunk/rc.d/rc.sysinit
Log:
sysconfig/clock and related actions are obsolete now. hwclock knows how to handle these based on adjtime settings.

Modified: rc-scripts/trunk/doc/sysconfig.docb
==============================================================================
--- rc-scripts/trunk/doc/sysconfig.docb	(original)
+++ rc-scripts/trunk/doc/sysconfig.docb	Thu Jan 27 07:02:13 2011
@@ -4,42 +4,6 @@
     <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>
       <varlistentry>

Modified: rc-scripts/trunk/doc/sysconfig.txt
==============================================================================
--- rc-scripts/trunk/doc/sysconfig.txt	(original)
+++ rc-scripts/trunk/doc/sysconfig.txt	Thu Jan 27 07:02:13 2011
@@ -3,23 +3,6 @@
 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>

Modified: rc-scripts/trunk/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/trunk/rc.d/rc.sysinit	(original)
+++ rc-scripts/trunk/rc.d/rc.sysinit	Thu Jan 27 07:02:13 2011
@@ -289,50 +289,9 @@
 	# 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 @@
 
 	# 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