summaryrefslogtreecommitdiff
path: root/cloudinit/config/cc_set_passwords.py
diff options
context:
space:
mode:
authorNate House nathan.house@rackspace.com <>2014-02-03 15:58:43 -0600
committerNate House nathan.house@rackspace.com <>2014-02-03 15:58:43 -0600
commit4a0e460f18d8cbf2651286565efec1f00cbb20cd (patch)
tree4ec27f92f3ca45da9b951b4bf501dcf49c0a21f4 /cloudinit/config/cc_set_passwords.py
parentb997a8cab8b3b10f9be7e915a5ab4c2cc91effb8 (diff)
downloadvyos-cloud-init-4a0e460f18d8cbf2651286565efec1f00cbb20cd.tar.gz
vyos-cloud-init-4a0e460f18d8cbf2651286565efec1f00cbb20cd.zip
Update yum unittest
Diffstat (limited to 'cloudinit/config/cc_set_passwords.py')
-rw-r--r--cloudinit/config/cc_set_passwords.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/config/cc_set_passwords.py b/cloudinit/config/cc_set_passwords.py
index b9dc0cc0..ab0ed5ad 100644
--- a/cloudinit/config/cc_set_passwords.py
+++ b/cloudinit/config/cc_set_passwords.py
@@ -137,9 +137,10 @@ def handle(_name, cfg, cloud, log, args):
util.write_file(ssh_util.DEF_SSHD_CFG, "\n".join(lines))
try:
- cmd = cloud.distro.init_cmd
+ cmd = cloud.distro.init_cmd # Default service
cmd.append(cloud.distro.get_option('ssh_svcname', 'ssh'))
cmd.append('restart')
+ cmd = filter(None, cmd) # Remove empty arguments
util.subp(cmd)
log.debug("Restarted the ssh daemon")
except: