diff options
| author | Scott Moser <smoser@ubuntu.com> | 2011-10-31 11:04:31 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2011-10-31 11:04:31 -0400 |
| commit | 6045bcc53d43a7d876d78c13d58cb7e94b282010 (patch) | |
| tree | d727fedd3033221df0cba377a00fbbd917e88ce6 /cloudinit | |
| parent | 7fc73a8d5585794ebf3a4b1a5a9e966a74f95607 (diff) | |
| download | vyos-cloud-init-6045bcc53d43a7d876d78c13d58cb7e94b282010.tar.gz vyos-cloud-init-6045bcc53d43a7d876d78c13d58cb7e94b282010.zip | |
make ssh service name configurable
Fedora's ssh service name is named 'sshd', Ubuntu's
is 'ssh'. This makes that configurable.
TODO: document ssh_svcname.
taken from
git://pkgs.fedoraproject.org/cloud-init.git
commit 87f33190f43d2b26cced4597e7298835024466c2
Author: Garrett Holmstrom <gholms@fedoraproject.org>
Patch11: cloud-init-0.6.2-sshsvc.patch
Diffstat (limited to 'cloudinit')
| -rw-r--r-- | cloudinit/CloudConfig/cc_set_passwords.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/CloudConfig/cc_set_passwords.py b/cloudinit/CloudConfig/cc_set_passwords.py index 92f0aac7..edfbaeeb 100644 --- a/cloudinit/CloudConfig/cc_set_passwords.py +++ b/cloudinit/CloudConfig/cc_set_passwords.py @@ -104,7 +104,7 @@ def handle(name,cfg,cloud,log,args): errors.append(e) try: - p = util.subp(['service', 'ssh', 'restart']) + p = util.subp(['service', cfg.get('ssh_svcname', 'ssh'), 'restart']) log.debug("restarted sshd") except: log.warn("restart of ssh failed") |