diff options
| author | Nate House nathan.house@rackspace.com <> | 2014-02-03 11:37:36 -0600 |
|---|---|---|
| committer | Nate House nathan.house@rackspace.com <> | 2014-02-03 11:37:36 -0600 |
| commit | b997a8cab8b3b10f9be7e915a5ab4c2cc91effb8 (patch) | |
| tree | d16d29a18e484bc5424a3ba5f46d55b09b4b796a | |
| parent | bc77232588dd587849e8b3b7fc599387b6c905fa (diff) | |
| download | vyos-cloud-init-b997a8cab8b3b10f9be7e915a5ab4c2cc91effb8.tar.gz vyos-cloud-init-b997a8cab8b3b10f9be7e915a5ab4c2cc91effb8.zip | |
Fix sshd restart
| -rw-r--r-- | cloudinit/distros/gentoo.py | 10 | ||||
| -rw-r--r-- | cloudinit/util.py | 1 |
2 files changed, 4 insertions, 7 deletions
diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py index 74431bf6..e8778e15 100644 --- a/cloudinit/distros/gentoo.py +++ b/cloudinit/distros/gentoo.py @@ -1,12 +1,8 @@ # vi: ts=4 expandtab # -# Copyright (C) 2012 Canonical Ltd. -# Copyright (C) 2012 Hewlett-Packard Development Company, L.P. -# Copyright (C) 2012 Yahoo! Inc. +# Copyright (C) 2014 Rackspace, US Inc. # -# Author: Scott Moser <scott.moser@canonical.com> -# Author: Juerg Haefliger <juerg.haefliger@hp.com> -# Author: Joshua Harlow <harlowja@yahoo-inc.com> +# Author: Nate House <nathan.house@rackspace.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License version 3, as @@ -53,7 +49,7 @@ class Distro(distros.Distro): self._runner = helpers.Runners(paths) self.osfamily = 'gentoo' # Fix sshd restarts - cfg['system_info']['ssh_svcname'] = '/etc/init.d/sshd' + cfg['ssh_svcname'] = '/etc/init.d/sshd' def apply_locale(self, locale, out_fn=None): if not out_fn: diff --git a/cloudinit/util.py b/cloudinit/util.py index 3ce54f28..54fdad20 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -1483,6 +1483,7 @@ def subp(args, data=None, rcs=None, env=None, capture=True, shell=False, logstring=False): if rcs is None: rcs = [0] + args = filter(None, args) # Remove empty arguments try: if not logstring: |