[Lunar-commits] r16125 - lunar-iso/trunk/lunar-install/sbin

[Auke Kok]

Author: sofar
Date: 2005-08-16 19:21:32 +0000 (Tue, 16 Aug 2005)
New Revision: 16125

Modified:
   lunar-iso/trunk/lunar-install/sbin/lunar-install
Log:
Bugfix: I ruined the timezone selector. Also, this will also set the system time to the HC on reboot for --utc machines, making timekeeping a bit more consistent across installations.


Modified: lunar-iso/trunk/lunar-install/sbin/lunar-install
===================================================================
--- lunar-iso/trunk/lunar-install/sbin/lunar-install	2005-08-16 18:09:23 UTC (rev 16124)
+++ lunar-iso/trunk/lunar-install/sbin/lunar-install	2005-08-16 19:21:32 UTC (rev 16125)
@@ -955,15 +955,15 @@
 	DEFAULT=${ZONE:-GMT}
 
 	while
-	  TIMEZONES=`show_timezones $ZONE`  &&
-	  ZONE=`$DIALOG  --title  "$TITLE"  \
-			         --default-item "$DEFAULT" \
-			         --menu             \
-			         "$HELP"            \
-			         0 0 0              \
-			         $TIMEZONES`        &&
-	  [ -d $LOCALTIME/$ZONE ]
-	  do
+		TIMEZONES=`show_timezones $ZONE`  &&
+		ZONE=`$DIALOG  --title  "$TITLE"  \
+		               --default-item "$DEFAULT" \
+		               --menu             \
+			       "$HELP"            \
+			       0 0 0              \
+			       $TIMEZONES`        &&
+		[ -d $LOCALTIME/$ZONE ]
+	do
 		true
 	done
 
@@ -974,21 +974,22 @@
 		HELP="Does the hardware clock store time in GMT or local?"
 
 		DEFAULT=${CLOCK:-Local}
-		CLOCK=`$DIALOG --title "$TITLE"   \
+		CLOCK=`$DIALOG --title "$TITLE"       \
+			           --default-item "$DEFAULT" \
 			           --menu "$HELP"     \
-			           --default-item "$DEFAULT" \
 			           0 0 0              \
-			           "GMT"    ""        \
-			           "Local"  ""`       &&
+			           "GMT" ""           \
+			           "Local" ""`       &&
 		case $CLOCK in
-			GMT) true ;;
-			Local) HWCLOCK="/sbin/hwclock --hctosys --localtime"
-				echo "#!/bin/sh" > $TARGET/etc/init.d/localtime
-				echo "$HWCLOCK" >> $TARGET/etc/init.d/localtime
-				chmod a+x $TARGET/etc/init.d/localtime
-				ln -s ../init.d/localtime $TARGET/etc/rcS.d/S15localtime
-			;;
+			GMT) HWCLOCK="--utc" ;;
+			Local) HWCLOCK="--localtim" ;;
 		esac
+		(
+			echo "#!/bin/sh"
+			echo "/sbin/hwclock --hctosys $HWCLOCK"
+		) > $TARGET/etc/init.d/localtime
+		chmod a+x $TARGET/etc/init.d/localtime
+		ln -s ../init.d/localtime $TARGET/etc/rcS.d/S15localtime
 	fi
 }