From 7500ef53598f2ee2c128bd9b93d5c94b1aa7b6e9 Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Sun, 7 Dec 2008 15:55:55 +0100
Subject: refactored/cleanup datetime/timezone stuff

---
 src/core/procedures/base        | 10 +---------
 src/core/procedures/interactive | 12 +-----------
 2 files changed, 2 insertions(+), 20 deletions(-)

(limited to 'src/core/procedures')

diff --git a/src/core/procedures/base b/src/core/procedures/base
index 7af1452..8a586fb 100644
--- a/src/core/procedures/base
+++ b/src/core/procedures/base
@@ -62,15 +62,7 @@ worker_runtime_packages ()
 
 worker_set_clock ()
 {
-	HARDWARECLOCK=utc
-	TIMEZONE=`tzselect`
-	HWCLOCK_PARAMS=" --utc"
-	if [ "$TIMEZONE" != "" -a -e "/usr/share/zoneinfo/$TIMEZONE" ]
-	then
-		cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime
-	fi
-	/sbin/hwclock --hctosys $HWCLOCK_PARAMS --noadjfile
-	#TODO: user must set date/time and store it   
+	interactive_set_clock
 }
 
 
diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive
index 66efaec..ce63bd1 100644
--- a/src/core/procedures/interactive
+++ b/src/core/procedures/interactive
@@ -1,5 +1,5 @@
 #!/bin/sh
-depend_procedure core base # esp for auto_{network,locale,fstab} workers
+depend_procedure core base # esp for auto_{network,locale,fstab} and set_clock workers
 
 
 # This is a port of the original /arch/setup script.  It doesn't use aif phases but uses it's own menu-based flow (phase) control
@@ -176,16 +176,6 @@ worker_prepare_disks()
 }
 
 
-# set_clock()
-# prompts user to set hardware clock and timezone
-#
-# params: none
-set_clock()   
-{
-	interactive_set_clock
-}
-
-
 worker_select_source ()
 {
 	#TODO: how to handle user going here again? discard previous settings, warn him that he already done it?
-- 
cgit v1.2.3-54-g00ecf