From b997a8cab8b3b10f9be7e915a5ab4c2cc91effb8 Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Mon, 3 Feb 2014 11:37:36 -0600 Subject: Fix sshd restart --- cloudinit/distros/gentoo.py | 10 +++------- 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 -# Author: Juerg Haefliger -# Author: Joshua Harlow +# Author: Nate House # # 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: -- cgit v1.2.3