summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNate House nathan.house@rackspace.com <>2014-01-27 11:43:13 -0600
committerNate House nathan.house@rackspace.com <>2014-01-27 11:43:13 -0600
commit8f6c9ff5ed7e301db2efa9ffa9a4bf454eb819e9 (patch)
treeba4ec25f6f66b8c73782d49bf2a2cc2251ec1071
parent2b416f666e26f37ad694d9cdefd0a80b77009848 (diff)
downloadvyos-cloud-init-8f6c9ff5ed7e301db2efa9ffa9a4bf454eb819e9.tar.gz
vyos-cloud-init-8f6c9ff5ed7e301db2efa9ffa9a4bf454eb819e9.zip
init_cmd inheritance fixes
-rw-r--r--cloudinit/distros/__init__.py2
-rw-r--r--cloudinit/distros/debian.py1
-rw-r--r--cloudinit/distros/gentoo.py1
-rw-r--r--cloudinit/distros/rhel.py1
4 files changed, 2 insertions, 3 deletions
diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py
index 61904b6f..9c9ac384 100644
--- a/cloudinit/distros/__init__.py
+++ b/cloudinit/distros/__init__.py
@@ -53,7 +53,7 @@ class Distro(object):
ci_sudoers_fn = "/etc/sudoers.d/90-cloud-init-users"
hostname_conf_fn = "/etc/hostname"
tz_zone_dir = "/usr/share/zoneinfo"
- init_cmd = [] # Not implemented
+ init_cmd = ['service'] # systemctl, service etc
def __init__(self, name, cfg, paths):
self._paths = paths
diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py
index 3b912728..1ae232fd 100644
--- a/cloudinit/distros/debian.py
+++ b/cloudinit/distros/debian.py
@@ -48,7 +48,6 @@ class Distro(distros.Distro):
network_conf_fn = "/etc/network/interfaces"
tz_conf_fn = "/etc/timezone"
tz_local_fn = "/etc/localtime"
- init_cmd = ['service']
def __init__(self, name, cfg, paths):
distros.Distro.__init__(self, name, cfg, paths)
diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py
index ede40bff..565c68ed 100644
--- a/cloudinit/distros/gentoo.py
+++ b/cloudinit/distros/gentoo.py
@@ -37,6 +37,7 @@ class Distro(distros.Distro):
network_conf_fn = "/etc/conf.d/net"
tz_conf_fn = "/etc/timezone"
tz_local_fn = "/etc/localtime"
+ init_cmd = ['']
def __init__(self, name, cfg, paths):
distros.Distro.__init__(self, name, cfg, paths)
diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py
index 7cc7a813..30195384 100644
--- a/cloudinit/distros/rhel.py
+++ b/cloudinit/distros/rhel.py
@@ -49,7 +49,6 @@ class Distro(distros.Distro):
network_script_tpl = '/etc/sysconfig/network-scripts/ifcfg-%s'
resolve_conf_fn = "/etc/resolv.conf"
tz_local_fn = "/etc/localtime"
- init_cmd = ['service']
def __init__(self, name, cfg, paths):
distros.Distro.__init__(self, name, cfg, paths)