[master/rhel7-branch] /etc/adjtime not wanted on s390(x)

[Vratislav Podzimek]

Easy fix for the bug with wrong /etc/adjtime file written out on s390(x)
systems. I cannot push the patch now, but I want to deal with it now and put it
into my backlog and push it once it's possible.

Vratislav Podzimek (1):
  Do not write out /etc/adjtime file on s390(x) (#1070748)

pyanaconda/timezone.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

[PATCH] Do not write out /etc/adjtime file on s390(x) (#1070748)

[Vratislav Podzimek]

Also fix a typo in the comment.

Signed-off-by: Vratislav Podzimek 
---
 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()

[PATCH] Do not write out /etc/adjtime file on s390(x) (#1070748)

[Samantha N. Bueno]

Looks good to me.

On Fri, Feb 28, 2014 at 09:49:34AM +0100, Vratislav Podzimek wrote:
> Also fix a typo in the comment.
> Signed-off-by: Vratislav Podzimek
>
> 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
>
> anaconda-patches mailing list
> [e-mail]
> https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches