Merge pull request #2730 from tomkins/devel

sysctl check fails if a custom sysctl_file is given.
2013-04-21 09:23:10 -07:00 · 2013-04-21 09:23:10 -07:00 · 97f9b6df1c
commit 97f9b6df1c
parent 7fabaec55f b1d5b97bbe
1 changed files with 1 additions and 1 deletions
--- a/library/sysctl
+++ b/library/sysctl
@ -89,7 +89,7 @@ def reload_sysctl(**sysctl_args):
        return 0, ''

    # 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)
    out, err = call.communicate()
    if call.returncode == 0: