From 1b76162517a5e742201e7c7974a2d6e0d437f789 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Thu, 20 Mar 2008 10:50:22 -0400
Subject: don't use /etc/sysconfig/clock (#438337)

---
 rc.d/init.d/halt | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

(limited to 'rc.d/init.d/halt')

diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
index ce6b24b1..2eb77582 100755
--- a/rc.d/init.d/halt
+++ b/rc.d/init.d/halt
@@ -99,34 +99,7 @@ if [ -f /etc/sysconfig/clock ]; then
    fi
 fi
 
-CLOCKDEF=""
-CLOCKFLAGS="$CLOCKFLAGS --systohc"
-
-case "$UTC" in
-   yes|true)
-	CLOCKFLAGS="$CLOCKFLAGS -u";
-	CLOCKDEF="$CLOCKDEF (utc)";
-	;;
-   no|false)
-	CLOCKFLAGS="$CLOCKFLAGS --localtime";
-	CLOCKDEF="$CLOCKDEF (localtime)";
-	;;
-esac
-
-case "$ARC" in
-   yes|true)
-	CLOCKFLAGS="$CLOCKFLAGS -A";
-	CLOCKDEF="$CLOCKDEF (arc)";
-	;;
-esac
-case "$SRM" in
-   yes|true)
-	CLOCKFLAGS="$CLOCKFLAGS -S";
-	CLOCKDEF="$CLOCKDEF (srm)";
-	;;
-esac
-
-[ -x /sbin/hwclock ] && action $"Syncing hardware clock to system time" /sbin/hwclock $CLOCKFLAGS
+[ -x /sbin/hwclock ] && action $"Syncing hardware clock to system time" /sbin/hwclock --systohc
 
 # Try to unmount tmpfs filesystems to avoid swapping them in.  Ignore failures.
 tmpfs=$(awk '$2 ~ /^\/($|proc|dev)/ { next; }
-- 
cgit v1.2.1