- tabs in preamble

[packages/anaconda.git] / anaconda-timezone.patch

--- anaconda-11.0.5/iw/timezone_gui.py~	2006-02-16 17:09:07.000000000 +0200
+++ anaconda-11.0.5/iw/timezone_gui.py	2006-05-24 02:51:14.854100882 +0300
@@ -41,7 +41,7 @@
         gtk.glade.set_custom_handler(self.custom_widget_handler)
 
         # Set the default now.  We'll fix it for real in getScreen.
-        self.default = "America/New_York"
+        self.default = "Europe/Tallinn"
 
         self.zonetab = zonetab.ZoneTab()
 
@@ -98,7 +98,7 @@
             asUTC = 0
 
         if (string.find(self.default, "UTC") != -1):
-            self.default = "America/New_York"
+            self.default = "Europe/Tallinn"
 
         # Now fix the default we set when we made the timezone map widget.
         self.tz.setCurrent(self.zonetab.findEntryByTZ(self.default))
@@ -117,7 +117,7 @@
     if curlat >= latmin and curlat <= latmax and curlong >= longmin and curlong <= longmax:
         return True
     elif user_data.currentEntry == None:
-        if model.get_value(iter, 1) == "America/New_York":
+        if model.get_value(iter, 1) == "Europe/Tallinn":
             return True
         else:
             return False
@@ -144,7 +144,7 @@
                               weight=pango.WEIGHT_BOLD)
             self.markers[entry.tz] = marker
 
-            if entry.tz == "America/New_York":
+            if entry.tz == "Europe/Tallinn":
                 #In case the /etc/sysconfig/clock is messed up, use New York as default
                 self.fallbackEntry = entry
 
--- anaconda-11.0.5/timezone.py	2006-09-26 20:37:15.448072953 +0300
+++ anaconda-11.0.5/timezone.py	2006-09-28 14:46:04.567338250 +0300
@@ -17,6 +17,8 @@
 import logging
 log = logging.getLogger("anaconda")
 
+import string
+
 def bool(val):
     if val: return "true"
     return "false"
@@ -42,11 +44,31 @@
 	    log.error("Error copying timezone (from %s): %s" % (fromFile, msg))
 
 	f = open(instPath + "/etc/sysconfig/clock", "w")
-
-	f.write('ZONE="%s"\n' % self.tz)
+	f.write('# Should the hardware clock be kept in Coordinated Universal Time (instead of local time).\n')
 	f.write("UTC=%s\n" % bool(self.utc))
+	f.write('# true means your machine uses epoch 1980 in its hardware clock\n')
 	f.write("ARC=%s\n" % bool(self.arc))
+	f.write('# true means your machine uses epoch 1900 in its hardware clock\n')
+	f.write("SRM=false\n")
+	f.close()
+
+	# FIXME: solution for timezones like EET
+	(area, zone) = string.split(self.tz, "/")
 
+	f = open(instPath + "/etc/sysconfig/timezone", "w")
+	f.write('# Time zone information.\n')
+	f.write('# Directory containing zone information files.\n')
+	f.write('ZONE_INFO_DIR="/usr/share/zoneinfo"\n')
+	f.write("\n");
+	f.write('# Scheme you would like to use in your system.\n')
+	f.write('ZONE_INFO_SCHEME="posix"\n')
+	f.write("\n")
+	f.write('# Area (sometimes may be empty)\n')
+	f.write('ZONE_INFO_AREA="%s"\n' % area)
+	f.write("\n")
+	f.write('# Name of the time zone for your system.\n')
+	f.write('TIME_ZONE="%s"\n' % zone)
+	f.write("\n");
 	f.close()
 
     def getTimezoneInfo(self):