From 8f6c9ff5ed7e301db2efa9ffa9a4bf454eb819e9 Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Mon, 27 Jan 2014 11:43:13 -0600 Subject: init_cmd inheritance fixes --- cloudinit/distros/__init__.py | 2 +- cloudinit/distros/debian.py | 1 - cloudinit/distros/gentoo.py | 1 + cloudinit/distros/rhel.py | 1 - 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) -- cgit v1.2.3