forked from pool/cloud-init
40 lines
1.8 KiB
Diff
40 lines
1.8 KiB
Diff
|
Index: cloud-init-0.6.3/cloudinit/CloudConfig/cc_byobu.py
|
||
|
|
===================================================================
|
||
|
|
--- cloud-init-0.6.3.orig/cloudinit/CloudConfig/cc_byobu.py
|
||
|
|
+++ cloud-init-0.6.3/cloudinit/CloudConfig/cc_byobu.py
|
||
|
|
@@ -55,7 +55,7 @@ def handle(_name, cfg, _cloud, log, args
|
||
|
|
|
||
|
|
shcmd = ""
|
||
|
|
if mod_user:
|
||
|
|
- user = util.get_cfg_option_str(cfg, "user", "ubuntu")
|
||
|
|
+ user = util.get_cfg_option_str(cfg, "user", "root")
|
||
|
|
shcmd += " sudo -Hu \"%s\" byobu-launcher-%s" % (user, bl_inst)
|
||
|
|
shcmd += " || X=$(($X+1)); "
|
||
|
|
if mod_sys:
|
||
|
|
Index: cloud-init-0.6.3/cloudinit/CloudConfig/cc_set_passwords.py
|
||
|
|
===================================================================
|
||
|
|
--- cloud-init-0.6.3.orig/cloudinit/CloudConfig/cc_set_passwords.py
|
||
|
|
+++ cloud-init-0.6.3/cloudinit/CloudConfig/cc_set_passwords.py
|
||
|
|
@@ -44,7 +44,7 @@ def handle(_name, cfg, _cloud, log, args
|
||
|
|
expire = util.get_cfg_option_bool(chfg, 'expire', expire)
|
||
|
|
|
||
|
|
if not plist and password:
|
||
|
|
- user = util.get_cfg_option_str(cfg, "user", "ubuntu")
|
||
|
|
+ user = util.get_cfg_option_str(cfg, "user", "root")
|
||
|
|
plist = "%s:%s" % (user, password)
|
||
|
|
|
||
|
|
errors = []
|
||
|
|
Index: cloud-init-0.6.3/cloudinit/CloudConfig/cc_ssh_import_id.py
|
||
|
|
===================================================================
|
||
|
|
--- cloud-init-0.6.3.orig/cloudinit/CloudConfig/cc_ssh_import_id.py
|
||
|
|
+++ cloud-init-0.6.3/cloudinit/CloudConfig/cc_ssh_import_id.py
|
||
|
|
@@ -30,7 +30,7 @@ def handle(_name, cfg, _cloud, log, args
|
||
|
|
if len(args) > 1:
|
||
|
|
ids = args[1:]
|
||
|
|
else:
|
||
|
|
- user = util.get_cfg_option_str(cfg, "user", "ubuntu")
|
||
|
|
+ user = util.get_cfg_option_str(cfg, "user", "root")
|
||
|
|
ids = util.get_cfg_option_list_or_str(cfg, "ssh_import_id", [])
|
||
|
|
|
||
|
|
if len(ids) == 0:
|