diff options
author | Radek Vykydal <rvykydal@redhat.com> | 2008-09-09 16:20:06 +0200 |
---|---|---|
committer | Radek Vykydal <rvykydal@redhat.com> | 2008-09-09 16:20:06 +0200 |
commit | c561708ccbb74b96885ef6c3bf40359fe55b3ac8 (patch) | |
tree | 3443c11ed4e551a7248232f44b0dc1619f1d4677 /kickstart.py | |
parent | 7979a016590d0678023354230d24eeb25dc45013 (diff) | |
download | anaconda-c561708ccbb74b96885ef6c3bf40359fe55b3ac8.tar.gz anaconda-c561708ccbb74b96885ef6c3bf40359fe55b3ac8.tar.xz anaconda-c561708ccbb74b96885ef6c3bf40359fe55b3ac8.zip |
Kickstart timezone validity check fixed (#461526)
Diffstat (limited to 'kickstart.py')
-rw-r--r-- | kickstart.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/kickstart.py b/kickstart.py index 08f08e5a5..c872feb03 100644 --- a/kickstart.py +++ b/kickstart.py @@ -721,9 +721,17 @@ class Timezone(commands.timezone.FC6_Timezone): def parse(self, args): commands.timezone.FC6_Timezone.parse(self, args) - tzfile = "/usr/share/zoneinfo" + self.timezone - if not os.access(tzfile, os.R_OK): - log.warning("Can't read timezone file set in kickstart, will ask") + # check validity + f = open('/usr/share/zoneinfo/zone.tab', 'r') + for line in f: + line = line.strip() + if line[0] == '#': + continue + fields = line.split('\t') + if len(fields) > 2 and fields[2] == self.timezone: + break + else: + log.warning("Timezone %s set in kickstart is not valid, will ask" % (self.timezone,)) return self.handler.id.timezone.setTimezoneInfo(self.timezone, self.isUtc) |