add 'bootcmd' like 'runcmd' to cloud-config syntax for running things early

1 files changed, 1 insertions, 14 deletions

diff --git a/cloudinit/CloudConfig/cc_runcmd.py b/cloudinit/CloudConfig/cc_runcmd.py
index afa7a441..f030980a 100644
--- a/cloudinit/CloudConfig/cc_runcmd.py
+++ b/cloudinit/CloudConfig/cc_runcmd.py
@@ -22,21 +22,8 @@ def handle(name,cfg,cloud,log,args):
     if not cfg.has_key("runcmd"):
         return
     outfile="%s/runcmd" % cloud.get_ipath('scripts')
-
-    content="#!/bin/sh\n"
-    escaped="%s%s%s%s" % ( "'", '\\', "'", "'" )
     try:
-        for args in cfg["runcmd"]:
-            # if the item is a list, wrap all items in single tick
-            # if its not, then just write it directly
-            if isinstance(args,list):
-                fixed = [ ]
-                for f in args:
-                    fixed.append("'%s'" % str(f).replace("'",escaped))
-                content="%s%s\n" % ( content, ' '.join(fixed) )
-            else:
-                content="%s%s\n" % ( content, str(args) )
-
+        content = util.shellify(cfg["runcmd"])
         util.write_file(outfile,content,0700)
     except:
         log.warn("failed to open %s for runcmd" % outfile)