[PATCH] Do not write out /etc/adjtime file on s390(x) (#1070748)
Vratislav Podzimek
vpodzime at redhat.com
Fri Feb 28 08:49:34 UTC 2014
Also fix a typo in the comment.
Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---
pyanaconda/timezone.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/timezone.py b/pyanaconda/timezone.py
index 5dca6fc..83f3191 100644
--- a/pyanaconda/timezone.py
+++ b/pyanaconda/timezone.py
@@ -66,7 +66,7 @@ def time_initialize(timezone, storage, bootloader):
"""
if arch.isS390():
- # nothing to do on s390 where hwclock doesn't exist
+ # nothing to do on s390(x) were hwclock doesn't exist
return
if not timezone.isUtc:
@@ -117,6 +117,10 @@ def write_timezone_config(timezone, root):
log.error("Error when symlinking timezone (from %s): %s" % \
(rooted_tz_file, oserr.strerror))
+ if arch.isS390():
+ # there is no HW clock on s390(x)
+ return
+
try:
fobj = open(os.path.normpath(root + "/etc/adjtime"), "r")
lines = fobj.readlines()
--
1.8.5.3
More information about the anaconda-patches
mailing list