saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #29014 from jfindlay/sysctl_col

Browse source 
systemd module: remove unneeded col command
This commit is contained in:
Mike Place 2015-11-18 10:58:59 -07:00
commit eedd50e7c3
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/modules/systemd.py
View file

@ -73,8 +73,7 @@ def _get_all_units():
r')\s+loaded\s+(?P<active>[^\s]+)')
out = __salt__['cmd.run_stdout'](
'systemctl --all --full --no-legend --no-pager list-units | col -b',
python_shell=True
'systemctl --all --full --no-legend --no-pager list-units'
)
ret = {}
@ -96,8 +95,7 @@ def _get_all_unit_files():
r')\s+(?P<state>.+)$')
out = __salt__['cmd.run_stdout'](
'systemctl --full --no-legend --no-pager list-unit-files | col -b',
python_shell=True
'systemctl --full --no-legend --no-pager list-unit-files'
)
ret = {}
@ -111,8 +109,8 @@ def _get_all_unit_files():
def _get_all_legacy_init_scripts():
'''
Get all old-fashioned init-style scripts. State is always inactive, because systemd would already show them
otherwise.
Get all old-fashioned init-style scripts. State is always inactive, because
systemd would already show them otherwise.
'''
ret = {}
if not os.path.isdir(LEGACY_INIT_SCRIPT_PATH):