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

Merge pull request #18163 from cachedout/keyboard_quote

Browse Source 
Set shell on keyboard module calls
This commit is contained in:
Thomas S Hatch 2014-11-17 21:05:28 -07:00
commit 7c186693ae
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/keyboard.py
View File

@ -38,7 +38,7 @@ def get_sys():
cmd = 'grep XKBLAYOUT /etc/default/keyboard | grep -vE "^#"'
elif 'Gentoo' in __grains__['os_family']:
cmd = 'grep "^keymap" /etc/conf.d/keymaps | grep -vE "^#"'
out = __salt__['cmd.run'](cmd).split('=')
out = __salt__['cmd.run'](cmd, python_shell=True).split('=')
ret = out[1].replace('"', '')
return ret
@ -81,7 +81,7 @@ def get_x():
salt '*' keyboard.get_x
'''
cmd = 'setxkbmap -query | grep layout'
out = __salt__['cmd.run'](cmd).split(':')
out = __salt__['cmd.run'](cmd, python_shell=True).split(':')
return out[1].strip()