diff options
| author | Radek Vykydal <rvykydal@redhat.com> | 2009-08-07 14:18:47 +0200 |
|---|---|---|
| committer | Radek Vykydal <rvykydal@redhat.com> | 2009-08-07 14:18:47 +0200 |
| commit | 6c6d1551a5e02f17ad8da30eec98b65706f088ae (patch) | |
| tree | a0b1780a12165a408d0d04b3dc9d4ed344ef4ffe | |
| parent | b37bc39eafa151b55a7fdabfa8fb38dffd152705 (diff) | |
| download | anaconda-6c6d1551a5e02f17ad8da30eec98b65706f088ae.tar.gz anaconda-6c6d1551a5e02f17ad8da30eec98b65706f088ae.tar.xz anaconda-6c6d1551a5e02f17ad8da30eec98b65706f088ae.zip | |
Do not go interactive if timezone in ks is not valid (#473647)
Handle invalid timezones in ks the same way as in RHEL 5.4:
in case that the timezone is invalid, the system time of install environment
will be set correctly if it is in tzdata package, and even if it is not there
the ks install will proceed. This will prevent possible breaking of installs
with kickstarts working in older versions of RHEL.
The question may be if we can/want to broaden valid timezones to all those
present in tzdata package officialy (document it). Complete tzdata package
is part of stage2 in Fedora and will be in RHEL 5.4.
| -rw-r--r-- | kickstart.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kickstart.py b/kickstart.py index e2c1a081d..13bc21281 100644 --- a/kickstart.py +++ b/kickstart.py @@ -888,8 +888,7 @@ class Timezone(commands.timezone.FC6_Timezone): tab = zonetab.ZoneTab() if self.timezone not in (entry.tz.replace(' ','_') for entry in tab.getEntries()): - log.warning("Timezone %s set in kickstart is not valid, will ask" % (self.timezone,)) - return retval + log.warning("Timezone %s set in kickstart is not valid." % (self.timezone,)) self.handler.id.timezone.setTimezoneInfo(self.timezone, self.isUtc) self.handler.skipSteps.append("timezone") |