summaryrefslogtreecommitdiff
path: root/cloudinit/distros
diff options
context:
space:
mode:
authorNate House nathan.house@rackspace.com <>2014-01-24 13:14:12 -0600
committerNate House nathan.house@rackspace.com <>2014-01-24 13:14:12 -0600
commit29780092f57931d7c22bfbf3af37dea00edc76c9 (patch)
tree00dbc3a652a126f11bbd05d10fdb434ff956f056 /cloudinit/distros
parentf64cd3d53fb09fb41104f600ead60eefe9dbd4ab (diff)
downloadvyos-cloud-init-29780092f57931d7c22bfbf3af37dea00edc76c9.tar.gz
vyos-cloud-init-29780092f57931d7c22bfbf3af37dea00edc76c9.zip
init_cmd distro unique supports gentoo init scripts
Diffstat (limited to 'cloudinit/distros')
-rw-r--r--cloudinit/distros/__init__.py1
-rw-r--r--cloudinit/distros/gentoo.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py
index 2b821926..61904b6f 100644
--- a/cloudinit/distros/__init__.py
+++ b/cloudinit/distros/__init__.py
@@ -53,6 +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
def __init__(self, name, cfg, paths):
self._paths = paths
diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py
index 82d49fc3..ede40bff 100644
--- a/cloudinit/distros/gentoo.py
+++ b/cloudinit/distros/gentoo.py
@@ -156,7 +156,8 @@ class Distro(distros.Distro):
elif args and isinstance(args, list):
cmd.extend(args)
- cmd.append(command)
+ if command:
+ cmd.append(command)
pkglist = util.expand_package_list('%s-%s', pkgs)
cmd.extend(pkglist)