valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update timezone.py shell cmds

Browse Source
This commit is contained in:
Justin Findlay 2014-11-17 16:56:44 -07:00
parent 22335c2f6c
commit e16da094d1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/modules/timezone.py
View File

@ -60,7 +60,7 @@ def get_zone():
'consider using timezone.get_zonecode or timezone.zonecompare')
elif 'Solaris' in __grains__['os_family']:
cmd = 'grep "TZ=" /etc/TIMEZONE'
out = __salt__['cmd.run'](cmd).split('=')
out = __salt__['cmd.run'](cmd, python_shell=True).split('=')
ret = out[1].replace('"', '')
return ret
@ -217,7 +217,8 @@ def get_hwclock():
elif 'Debian' in __grains__['os_family']:
#Original way to look up hwclock on Debian-based systems
cmd = 'grep "UTC=" /etc/default/rcS | grep -vE "^#"'
out = __salt__['cmd.run'](cmd, ignore_retcode=True).split('=')
out = __salt__['cmd.run'](
cmd, ignore_retcode=True, python_shell=True).split('=')
if len(out) > 1:
if out[1] == 'yes':
return 'UTC'
@ -229,7 +230,7 @@ def get_hwclock():
return __salt__['cmd.run'](cmd)
elif 'Gentoo' in __grains__['os_family']:
cmd = 'grep "^clock=" /etc/conf.d/hwclock | grep -vE "^#"'
out = __salt__['cmd.run'](cmd).split('=')
out = __salt__['cmd.run'](cmd, python_shell=True).split('=')
return out[1].replace('"', '')
elif 'Solaris' in __grains__['os_family']:
if os.path.isfile('/etc/rtc_config'):