SHA256
1
0
forked from pool/cloud-init
cloud-init/dynamicInitCmd.diff

29 lines
1.1 KiB
Diff

=== modified file 'cloudinit/config/cc_set_passwords.py'
Index: cloudinit/config/cc_set_passwords.py
===================================================================
--- cloudinit/config/cc_set_passwords.py.orig
+++ cloudinit/config/cc_set_passwords.py
@@ -147,7 +147,7 @@ def handle(_name, cfg, cloud, log, args)
util.write_file(ssh_util.DEF_SSHD_CFG, "\n".join(lines))
try:
- cmd = cloud.distro.init_cmd # Default service
+ cmd = cloud.distro.get_init_cmd()
cmd.append(cloud.distro.get_option('ssh_svcname', 'ssh'))
cmd.append('restart')
if 'systemctl' in cmd: # Switch action ordering
Index: cloudinit/distros/__init__.py
===================================================================
--- cloudinit/distros/__init__.py.orig
+++ cloudinit/distros/__init__.py
@@ -88,6 +88,9 @@ class Distro(object):
" no file found at %s") % (tz, tz_file))
return tz_file
+ def get_init_cmd(self):
+ return self.init_cmd
+
def get_option(self, opt_name, default=None):
return self._cfg.get(opt_name, default)