diff options
| -rw-r--r-- | kickstart.py | 5 | ||||
| -rw-r--r-- | timezone.py | 12 |
2 files changed, 13 insertions, 4 deletions
diff --git a/kickstart.py b/kickstart.py index fa8b315ca..b7e04f3ec 100644 --- a/kickstart.py +++ b/kickstart.py @@ -709,6 +709,11 @@ 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") + return + self.handler.id.timezone.setTimezoneInfo(self.timezone, self.isUtc) self.handler.skipSteps.append("timezone") diff --git a/timezone.py b/timezone.py index 3960d819d..bb599bb57 100644 --- a/timezone.py +++ b/timezone.py @@ -19,6 +19,7 @@ import shutil import iutil +import os from flags import flags import logging @@ -43,10 +44,13 @@ class Timezone: fromFile = instPath + "/usr/share/zoneinfo/" + self.tz - try: - shutil.copyfile(fromFile, instPath + "/etc/localtime") - except OSError, (errno, msg): - log.error("Error copying timezone (from %s): %s" % (fromFile, msg)) + if not os.access(fromFile, os.R_OK): + log.error("Timezone to be copied (%s) doesn't exist" % fromFile) + else: + try: + shutil.copyfile(fromFile, instPath + "/etc/localtime") + except OSError, (errno, msg): + log.error("Error copying timezone (from %s): %s" % (fromFile, msg)) f = open(instPath + "/etc/sysconfig/clock", "w") |