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

Use new utils function to check systemd version

Browse Source
This commit is contained in:
Erik Johnson 2015-03-03 09:39:31 -07:00
parent ee570cf0a2
commit 75c53006d8
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
salt/modules/linux_sysctl.py
View File

@ -57,22 +57,9 @@ def default_config():
salt -G 'kernel:Linux' sysctl.default_config
'''
if salt.utils.systemd.booted(__context__):
for line in __salt__['cmd.run_stdout'](
'systemctl --version'
).splitlines():
if line.startswith('systemd '):
version = line.split()[-1]
try:
if int(version) >= 207:
return _check_systemd_salt_config()
except ValueError:
log.error(
'Unexpected non-numeric systemd version {0!r} '
'detected'.format(version)
)
break
if salt.utils.systemd.booted(__context__) \
and salt.utils.systemd.version(__context__) >= 207:
return _check_systemd_salt_config()
return '/etc/sysctl.conf'