Commit 97f9b6df by Michael DeHaan

Merge pull request #2730 from tomkins/devel

sysctl check fails if a custom sysctl_file is given.
parents 7fabaec5 b1d5b97b
...@@ -89,7 +89,7 @@ def reload_sysctl(**sysctl_args): ...@@ -89,7 +89,7 @@ def reload_sysctl(**sysctl_args):
return 0, '' return 0, ''
# do it # do it
cmd = [ '/sbin/sysctl', '-p' ] cmd = [ '/sbin/sysctl', '-p', sysctl_args['sysctl_file']]
call = subprocess.Popen(cmd, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE) call = subprocess.Popen(cmd, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out, err = call.communicate() out, err = call.communicate()
if call.returncode == 0: if call.returncode == 0:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment