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

replace tab with space and trailing whitespace fix

Browse Source
This commit is contained in:
Baiju Muthukadan 2012-05-04 20:10:32 +05:30
parent 6bcc64da7b
commit a44d181c9a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/__init__.py
View File

@ -29,8 +29,8 @@ class Master(object):
# command line overrides config
if self.cli['user']:
self.opts['user'] = self.cli['user']
# Send the pidfile location to the opts
# Send the pidfile location to the opts
if self.cli['pidfile']:
self.opts['pidfile'] = self.cli['pidfile']

6
salt/modules/selinux.py
View File

@ -19,7 +19,7 @@ def __virtual__():
return False
if not salt.utils.which('seinfo'):
return False
global __selinux_fs_path__
if __grains__['kernel'] == 'Linux':
# systems running systemd (e.g. Fedora 15 and newer)
@ -103,9 +103,9 @@ def setsebool(boolean, value, persist=False):
salt '*' selinux.setsebool virt_use_usb off
'''
if persist:
cmd = 'setsebool -P {0} {1}'.format(boolean, value)
cmd = 'setsebool -P {0} {1}'.format(boolean, value)
else:
cmd = 'setsebool {0} {1}'.format(boolean, value)
cmd = 'setsebool {0} {1}'.format(boolean, value)
return not __salt__['cmd.retcode'](cmd)