File 0028-change-TIMEZONE-on-SUSE-systems-bsc-100893... of Package salt

Overview Repositories Revisions Requests Users Attributes Meta

File 0028-change-TIMEZONE-on-SUSE-systems-bsc-1008933.patch of Package salt (Revision 025b0663ed0fcb3c277bd50b9f33b3c3)

Currently displaying revision 025b0663ed0fcb3c277bd50b9f33b3c3 , Show latest

From 9996e13da196ef6b026bb9d8ceb186948db5793c Mon Sep 17 00:00:00 2001
From: Michael Calmer <mc@suse.de>
Date: Thu, 10 Nov 2016 10:57:10 +0100
Subject: [PATCH 28/38] change TIMEZONE on SUSE systems (bsc#1008933)

---
 salt/modules/timezone.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/salt/modules/timezone.py b/salt/modules/timezone.py
index 29f1590..0fb0b66 100644
--- a/salt/modules/timezone.py
+++ b/salt/modules/timezone.py
@@ -210,7 +210,7 @@ def set_zone(timezone):
             '/etc/sysconfig/clock', '^ZONE=.*', 'ZONE="{0}"'.format(timezone))
     elif 'Suse' in __grains__['os_family']:
         __salt__['file.sed'](
-            '/etc/sysconfig/clock', '^ZONE=.*', 'ZONE="{0}"'.format(timezone))
+            '/etc/sysconfig/clock', '^TIMEZONE=.*', 'TIMEZONE="{0}"'.format(timezone))
     elif 'Debian' in __grains__['os_family']:
         with salt.utils.fopen('/etc/timezone', 'w') as ofh:
             ofh.write(timezone.strip())
@@ -393,7 +393,7 @@ def set_hwclock(clock):
             '/etc/sysconfig/clock', '^ZONE=.*', 'ZONE="{0}"'.format(timezone))
     elif 'Suse' in __grains__['os_family']:
         __salt__['file.sed'](
-            '/etc/sysconfig/clock', '^ZONE=.*', 'ZONE="{0}"'.format(timezone))
+            '/etc/sysconfig/clock', '^TIMEZONE=.*', 'TIMEZONE="{0}"'.format(timezone))
     elif 'Debian' in __grains__['os_family']:
         if clock == 'UTC':
             __salt__['file.sed']('/etc/default/rcS', '^UTC=.*', 'UTC=yes')
-- 
2.10.2

Places

File 0028-change-TIMEZONE-on-SUSE-systems-bsc-1008933.patch of Package salt (Revision 025b0663ed0fcb3c277bd50b9f33b3c3)

Places