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

3 files changed, 60 insertions, 14 deletions

diff --git a/cloudinit/CloudConfig/cc_bootcmd.py b/cloudinit/CloudConfig/cc_bootcmd.py
new file mode 100644
index 00000000..9eccfd78
--- /dev/null
+++ b/cloudinit/CloudConfig/cc_bootcmd.py
@@ -0,0 +1,40 @@
+# vi: ts=4 expandtab
+#
+#    Copyright (C) 2009-2011 Canonical Ltd.
+#
+#    Author: Scott Moser <scott.moser@canonical.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License version 3, as
+#    published by the Free Software Foundation.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+import cloudinit.util as util
+import subprocess
+import tempfile
+
+def handle(name,cfg,cloud,log,args):
+    if not cfg.has_key("bootcmd"):
+        return
+
+    try:
+        content = util.shellify(cfg["bootcmd"])
+        tmpf = tempfile.TemporaryFile()
+        tmpf.write(content)
+        tmpf.seek(0)
+    except:
+        log.warn("failed to shellify bootcmd")
+        raise
+    
+    try:
+        subprocess.check_call(['/bin/sh'], stdin=tmpf)
+        tmpf.close()
+    except:
+        log.warn("failed to run commands from bootcmd")
+        raise
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)
diff --git a/cloudinit/util.py b/cloudinit/util.py
index 40925b94..72db58f9 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -338,3 +338,22 @@ def readurl(url, data=None):
 
    response = urllib2.urlopen(req)
    return(response.read())
+
+# shellify, takes a list of commands
+#  for each entry in the list
+#    if it is an array, shell protect it (with single ticks)
+#    if it is a string, do nothing
+def shellify(cmdlist):
+    content="#!/bin/sh\n"
+    escaped="%s%s%s%s" % ( "'", '\\', "'", "'" )
+    for args in cmdlist:
+        # 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) )
+    return content