Merge pull request saltstack#18281 from cro/mdadm_update

Properly quote parameters to mdadm
thatch45 · Nov 21, 2014 · c02e2e9 · c02e2e9
2 parents 3b91d96 + ae2b506
commit c02e2e9
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/salt/modules/makeconf.py b/salt/modules/makeconf.py
@@ -40,11 +40,8 @@ def _add_var(var, value):
     fullvar = '{0}="{1}"'.format(var, value)
     if __salt__['file.contains'](makeconf, layman):
         # TODO perhaps make this a function in the file module?
-        cmd = r"sed -i '/{0}/ i\{1}' {2}".format(
-            layman.replace("/", "\\/"),
-            fullvar,
-            makeconf)
-        print cmd
+        cmd = ['sed', '-i', '/{0}/'.format(layman.replace('/', '\\/')),
+               fullvar, makeconf]
         __salt__['cmd.run'](cmd)
     else:
         __salt__['file.append'](makeconf, fullvar)