summaryrefslogtreecommitdiffstats
path: root/pyanaconda/kickstart.py
diff options
context:
space:
mode:
authorVratislav Podzimek <vpodzime@redhat.com>2012-06-08 13:44:04 +0200
committerVratislav Podzimek <vpodzime@redhat.com>2012-08-22 19:59:18 +0200
commit0c00d5f19579f283a510881b0988d40d16ffe955 (patch)
treec55afd86f0bb212a4c37f6af14dae2cf7be94a4c /pyanaconda/kickstart.py
parent4051d57b84bbbff496069782456df2ff87d9309d (diff)
downloadanaconda-0c00d5f19579f283a510881b0988d40d16ffe955.tar.gz
anaconda-0c00d5f19579f283a510881b0988d40d16ffe955.tar.xz
anaconda-0c00d5f19579f283a510881b0988d40d16ffe955.zip
Remove the last usage of the system-config-date in Anaconda
We now don't use the system-config-date's timezone map and the only remaining thing we use sdate for is determining if some string is a valid timezone. This can be easily replaced and thus scdate can be removed from anaconda dependencies and the installation image.
Diffstat (limited to 'pyanaconda/kickstart.py')
-rw-r--r--pyanaconda/kickstart.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 0e09e7ac7..73d435d82 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -47,9 +47,9 @@ import urlgrabber
import network
import pykickstart.commands as commands
from storage.devices import *
-from scdate.core import zonetab
from pyanaconda import keyboard
from pyanaconda import ntp
+from pyanaconda import localization
from pyanaconda.simpleconfig import SimpleConfigFile
from pykickstart.base import KickstartCommand
@@ -1253,14 +1253,8 @@ class Services(commands.services.FC6_Services):
class Timezone(commands.timezone.F18_Timezone):
def execute(self):
- # check validity
- tab = zonetab.ZoneTab()
- if self.timezone not in (entry.tz.replace(' ','_') for entry in
- tab.getEntries()):
+ if not localization.is_valid_timezone(self.timezone):
log.warning("Timezone %s set in kickstart is not valid." % (self.timezone,))
-
- self.anaconda.timezone.setTimezoneInfo(self.timezone, self.isUtc)
-
chronyd_conf_path = os.path.normpath(ROOT_PATH + ntp.NTP_CONFIG_FILE)
ntp.save_servers_to_config(self.ntpservers,
conf_file_path=chronyd_conf_path)