From 23330d12326fc5c8e5dd05c4be5fc1a62426440f Mon Sep 17 00:00:00 2001 From: "yuhuan.yang" Date: Tue, 29 Aug 2017 19:33:16 +0800 Subject: [PATCH] Timezone setting change Change-Id: I90bdc068430589f04ab148b3b8b9b31d8b197613 --- mic/kickstart/__init__.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mic/kickstart/__init__.py b/mic/kickstart/__init__.py index f568f99..76cc525 100755 --- a/mic/kickstart/__init__.py +++ b/mic/kickstart/__init__.py @@ -200,16 +200,23 @@ class TimezoneConfig(KickstartConfig): f.write("ZONE=\"" + tz + "\"\n") f.write("UTC=" + utc + "\n") f.close() + if not os.path.exists("/opt/etc"): + fs.makedirs("/opt/etc") tz_source = "/usr/share/zoneinfo/%s" % (tz) + tz_midst = "/opt/etc/localtime" tz_dest = "/etc/localtime" try: lncmd = fs.find_binary_inchroot('ln', self.instroot) if lncmd: - self.call([lncmd, "-s", tz_source, tz_dest]) + self.call([lncmd, "-s", tz_source, tz_midst]) + self.call([lncmd, "-s", tz_midst, tz_dest]) else: lncmd = fs.find_binary_path('ln') subprocess.call([lncmd, "-s", self.path(tz_source), + self.path(tz_midst)]) + subprocess.call([lncmd, "-s", + self.path(tz_midst), self.path(tz_dest)]) except (IOError, OSError), (errno, msg): raise errors.KsError("Timezone setting error: %s" % msg) -- 2.7.4