--- hwclockfirst.sh.orig	2005-08-22 20:21:53.000000000 +0100
+++ hwclockfirst.sh	2005-08-22 20:33:13.000000000 +0100
@@ -16,12 +16,32 @@
 #		before changing this file. You risk serious clock
 #		misbehaviour otherwise.
 
-FIRST=yes	# debian/rules sets this to 'yes' when creating hwclockfirst.sh
-
 # Set this to any options you might need to give to hwclock, such
 # as machine hardware clock type for Alphas.
 HWCLOCKPARS=
 
+# Uncomment the hwclock --adjust line below if you want
+# hwclock to try to correct systematic drift errors in the
+# Hardware Clock.
+#
+# WARNING: If you uncomment this option, you must either make
+# sure *nothing* changes the Hardware Clock other than
+# hwclock --systohc, or you must delete /etc/adjtime
+# every time someone else modifies the Hardware Clock.
+#
+# Common "vilains" are: ntp, MS Windows, the BIOS Setup
+# program.
+#
+# WARNING: You must remember to invalidate (delete)
+# /etc/adjtime if you ever need to set the system clock
+# to a very different value and hwclock --adjust is being
+# used.
+#
+# Please read /usr/share/doc/util-linux/README.Debian.hwclock
+# before enablig hwclock --adjust.
+#ADJUST="--adjust"
+ADJUST="--noadjfile"
+
 [ ! -x /sbin/hwclock ] && exit 0
 . /etc/default/rcS
 
@@ -62,54 +82,20 @@
 		    echo "0.0 0 0.0" > /etc/adjtime
 		fi
 
-		if [ "$FIRST" != yes ]; then
-		    # Uncomment the hwclock --adjust line below if you want
-		    # hwclock to try to correct systematic drift errors in the
-		    # Hardware Clock.
-		    #
-		    # WARNING: If you uncomment this option, you must either make
-		    # sure *nothing* changes the Hardware Clock other than
-		    # hwclock --systohc, or you must delete /etc/adjtime
-		    # every time someone else modifies the Hardware Clock.
-		    #
-		    # Common "vilains" are: ntp, MS Windows, the BIOS Setup
-		    # program.
-		    #
-		    # WARNING: You must remember to invalidate (delete)
-		    # /etc/adjtime if you ever need to set the system clock
-		    # to a very different value and hwclock --adjust is being
-		    # used.
-		    #
-		    # Please read /usr/share/doc/util-linux/README.Debian.hwclock
-		    # before enablig hwclock --adjust.
-
-		    #hwclock --adjust $GMT $BADYEAR
-		    :
-		fi
-
 		if [ "$HWCLOCKACCESS" != no ]; then
 		    log_begin_msg "Setting the System Clock using the Hardware Clock as reference"
 
 		    # Copies Hardware Clock time to System Clock using the correct
 		    # timezone for hardware clocks in local time, and sets kernel
 		    # timezone. DO NOT REMOVE.
-		    /sbin/hwclock --hctosys $GMT $HWCLOCPARS $BADYEAR
+		    export TZ
+		    /sbin/hwclock --hctosys $ADJUST $GMT $HWCLOCPARS $BADYEAR
 
-		    if [ "$FIRST" = yes ]; then
-			# Copies Hardware Clock time to System Clock using the correct
-			# timezone for hardware clocks in local time, and sets kernel
-			# timezone. DO NOT REMOVE.
-			if [ -z "$TZ" ]; then
-			   /sbin/hwclock --noadjfile --hctosys $GMT $HWCLOCKPARS $BADYEAR
-			else
-			   TZ="$TZ" /sbin/hwclock --noadjfile --hctosys $GMT $HWCLOCKPARS $BADYEAR
-			fi
 
-			if /sbin/hwclock --show $GMT $HWCLOCKPARS $BADYEAR 2>&1 > /dev/null |
+		    if /sbin/hwclock --show $GMT $HWCLOCKPARS $BADYEAR 2>&1 > /dev/null |
 			    grep -q '^The Hardware Clock registers contain values that are either invalid'; then
-				echo "Invalid system date -- setting to 1/1/2002"
-				/sbin/hwclock --set --date '1/1/2002 00:00:00' $GMT $HWCLOCKPARS $BADYEAR
-			fi
+			    echo "Invalid system date -- setting to 1/1/2002"
+			    /sbin/hwclock --set --date '1/1/2002 00:00:00' $GMT $HWCLOCKPARS $BADYEAR
 		    fi
 
 		    #	Announce the local time.