merge with trunk

1 files changed, 24 insertions, 3 deletions

diff --git a/cloudinit/config/cc_emit_upstart.py b/cloudinit/config/cc_emit_upstart.py
index 6d376184..86ae97ab 100644
--- a/cloudinit/config/cc_emit_upstart.py
+++ b/cloudinit/config/cc_emit_upstart.py
@@ -21,11 +21,31 @@
 import os
 
 from cloudinit.settings import PER_ALWAYS
+from cloudinit import log as logging
 from cloudinit import util
 
 frequency = PER_ALWAYS
 
 distros = ['ubuntu', 'debian']
+LOG = logging.getLogger(__name__)
+
+
+def is_upstart_system():
+    if not os.path.isfile("/sbin/initctl"):
+        LOG.debug("no /sbin/initctl located")
+        return False
+
+    myenv = os.environ.copy()
+    if 'UPSTART_SESSION' in myenv:
+        del myenv['UPSTART_SESSION']
+    check_cmd = ['initctl', 'version']
+    try:
+        (out, err) = util.subp(check_cmd, env=myenv)
+        return 'upstart' in out
+    except util.ProcessExecutionError as e:
+        LOG.debug("'%s' returned '%s', not using upstart",
+                  ' '.join(check_cmd), e.exit_code)
+    return False
 
 
 def handle(name, _cfg, cloud, log, args):
@@ -34,10 +54,11 @@ def handle(name, _cfg, cloud, log, args):
         # Default to the 'cloud-config'
         # event for backwards compat.
         event_names = ['cloud-config']
-    if not os.path.isfile("/sbin/initctl"):
-        log.debug(("Skipping module named %s,"
-                   " no /sbin/initctl located"), name)
+
+    if not is_upstart_system():
+        log.debug("not upstart system, '%s' disabled")
         return
+
     cfgpath = cloud.paths.get_ipath_cur("cloud_config")
     for n in event_names:
         cmd = ['initctl', 'emit', str(n), 'CLOUD_CFG=%s' % cfgpath]