]>
Commit | Line | Data |
---|---|---|
dd9587f1 ER |
1 | --- anaconda-11.0.5/iw/timezone_gui.py~ 2006-02-16 17:09:07.000000000 +0200 |
2 | +++ anaconda-11.0.5/iw/timezone_gui.py 2006-05-24 02:51:14.854100882 +0300 | |
3 | @@ -41,7 +41,7 @@ | |
4 | gtk.glade.set_custom_handler(self.custom_widget_handler) | |
5 | ||
6 | # Set the default now. We'll fix it for real in getScreen. | |
7 | - self.default = "America/New_York" | |
8 | + self.default = "Europe/Tallinn" | |
9 | ||
10 | self.zonetab = zonetab.ZoneTab() | |
11 | ||
12 | @@ -98,7 +98,7 @@ | |
13 | asUTC = 0 | |
14 | ||
15 | if (string.find(self.default, "UTC") != -1): | |
16 | - self.default = "America/New_York" | |
17 | + self.default = "Europe/Tallinn" | |
18 | ||
19 | # Now fix the default we set when we made the timezone map widget. | |
20 | self.tz.setCurrent(self.zonetab.findEntryByTZ(self.default)) | |
21 | @@ -117,7 +117,7 @@ | |
22 | if curlat >= latmin and curlat <= latmax and curlong >= longmin and curlong <= longmax: | |
23 | return True | |
24 | elif user_data.currentEntry == None: | |
25 | - if model.get_value(iter, 1) == "America/New_York": | |
26 | + if model.get_value(iter, 1) == "Europe/Tallinn": | |
27 | return True | |
28 | else: | |
29 | return False | |
30 | @@ -144,7 +144,7 @@ | |
31 | weight=pango.WEIGHT_BOLD) | |
32 | self.markers[entry.tz] = marker | |
33 | ||
34 | - if entry.tz == "America/New_York": | |
35 | + if entry.tz == "Europe/Tallinn": | |
36 | #In case the /etc/sysconfig/clock is messed up, use New York as default | |
37 | self.fallbackEntry = entry | |
38 | ||
628ff5bd ER |
39 | --- anaconda-11.0.5/timezone.py 2006-09-26 20:37:15.448072953 +0300 |
40 | +++ anaconda-11.0.5/timezone.py 2006-09-28 14:46:04.567338250 +0300 | |
41 | @@ -17,6 +17,8 @@ | |
42 | import logging | |
43 | log = logging.getLogger("anaconda") | |
44 | ||
45 | +import string | |
46 | + | |
47 | def bool(val): | |
48 | if val: return "true" | |
49 | return "false" | |
50 | @@ -42,11 +44,31 @@ | |
f1c25a37 ER |
51 | log.error("Error copying timezone (from %s): %s" % (fromFile, msg)) |
52 | ||
53 | f = open(instPath + "/etc/sysconfig/clock", "w") | |
54 | - | |
55 | - f.write('ZONE="%s"\n' % self.tz) | |
628ff5bd | 56 | + f.write('# Should the hardware clock be kept in Coordinated Universal Time (instead of local time).\n') |
f1c25a37 | 57 | f.write("UTC=%s\n" % bool(self.utc)) |
628ff5bd | 58 | + f.write('# true means your machine uses epoch 1980 in its hardware clock\n') |
f1c25a37 | 59 | f.write("ARC=%s\n" % bool(self.arc)) |
628ff5bd | 60 | + f.write('# true means your machine uses epoch 1900 in its hardware clock\n') |
f1c25a37 ER |
61 | + f.write("SRM=false\n") |
62 | + f.close() | |
63 | + | |
64 | + # FIXME: solution for timezones like EET | |
65 | + (area, zone) = string.split(self.tz, "/") | |
66 | ||
67 | + f = open(instPath + "/etc/sysconfig/timezone", "w") | |
628ff5bd ER |
68 | + f.write('# Time zone information.\n') |
69 | + f.write('# Directory containing zone information files.\n') | |
70 | + f.write('ZONE_INFO_DIR="/usr/share/zoneinfo"\n') | |
f1c25a37 | 71 | + f.write("\n"); |
628ff5bd ER |
72 | + f.write('# Scheme you would like to use in your system.\n') |
73 | + f.write('ZONE_INFO_SCHEME="posix"\n') | |
f1c25a37 | 74 | + f.write("\n") |
628ff5bd | 75 | + f.write('# Area (sometimes may be empty)\n') |
f1c25a37 ER |
76 | + f.write('ZONE_INFO_AREA="%s"\n' % area) |
77 | + f.write("\n") | |
628ff5bd | 78 | + f.write('# Name of the time zone for your system.\n') |
f1c25a37 ER |
79 | + f.write('TIME_ZONE="%s"\n' % zone) |
80 | + f.write("\n"); | |
81 | f.close() | |
82 | ||
83 | def getTimezoneInfo(self): |