summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2014-07-31 15:10:31 -0400
committerScott Moser <smoser@ubuntu.com>2014-07-31 15:10:31 -0400
commita4e49a2d41413a8a471399fdb35568c1b1cd3130 (patch)
treef53fa59e537544d678a53b1fa2a0dd1fd5d644bf /cloudinit
parent36067bc77e6697ed5c5a50b4b17bbc95911d0d76 (diff)
downloadvyos-cloud-init-a4e49a2d41413a8a471399fdb35568c1b1cd3130.tar.gz
vyos-cloud-init-a4e49a2d41413a8a471399fdb35568c1b1cd3130.zip
ubuntu-init-switch: fix for determining if systemd
/run/systemd/ seems to exist even if systemd is not the init system. but /run/systemd/system/ only exists if it has been used as init.
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/config/cc_ubuntu_init_switch.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/config/cc_ubuntu_init_switch.py b/cloudinit/config/cc_ubuntu_init_switch.py
index 485c46a4..58a5549e 100644
--- a/cloudinit/config/cc_ubuntu_init_switch.py
+++ b/cloudinit/config/cc_ubuntu_init_switch.py
@@ -111,7 +111,7 @@ def handle(name, cfg, cloud, log, args):
log.warn("%s: target set to %s, expected one of: %s",
name, target, str(supported))
- if os.path.exists("/run/systemd"):
+ if os.path.exists("/run/systemd/system"):
current = "systemd"
else:
current = "upstart"