Update sshkeytypes patch
This commit is contained in:
parent
56f9947292
commit
f354744043
@ -2,6 +2,15 @@ Index: cloud-init/cloudinit/CloudConfig/cc_ssh.py
|
|||||||
===================================================================
|
===================================================================
|
||||||
--- cloud-init.orig/cloudinit/CloudConfig/cc_ssh.py
|
--- cloud-init.orig/cloudinit/CloudConfig/cc_ssh.py
|
||||||
+++ cloud-init/cloudinit/CloudConfig/cc_ssh.py
|
+++ cloud-init/cloudinit/CloudConfig/cc_ssh.py
|
||||||
|
@@ -31,7 +31,7 @@ def handle(name,cfg,cloud,log,args):
|
||||||
|
global_log = log
|
||||||
|
|
||||||
|
# remove the static keys from the pristine image
|
||||||
|
- for f in glob.glob("/etc/ssh/ssh_host_*_key*"):
|
||||||
|
+ for f in glob.glob("/etc/ssh/ssh_host_*key*"):
|
||||||
|
try: os.unlink(f)
|
||||||
|
except: pass
|
||||||
|
|
||||||
@@ -61,10 +61,10 @@ def handle(name,cfg,cloud,log,args):
|
@@ -61,10 +61,10 @@ def handle(name,cfg,cloud,log,args):
|
||||||
log.debug("generated %s from %s" % pair)
|
log.debug("generated %s from %s" % pair)
|
||||||
else:
|
else:
|
||||||
@ -17,6 +26,18 @@ Index: cloud-init/cloudinit/CloudConfig/cc_ssh.py
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
user = util.get_cfg_option_str(cfg,'user')
|
user = util.get_cfg_option_str(cfg,'user')
|
||||||
|
@@ -82,11 +82,6 @@ def handle(name,cfg,cloud,log,args):
|
||||||
|
util.logexc(log)
|
||||||
|
log.warn("applying credentials failed!\n")
|
||||||
|
|
||||||
|
- send_ssh_keys_to_console()
|
||||||
|
-
|
||||||
|
-def send_ssh_keys_to_console():
|
||||||
|
- subprocess.call(('/usr/libexec/cloud-init/write-ssh-key-fingerprints',))
|
||||||
|
-
|
||||||
|
def apply_credentials(keys, user, disable_root, disable_root_opts=DISABLE_ROOT_OPTS, log=global_log):
|
||||||
|
keys = set(keys)
|
||||||
|
if user:
|
||||||
Index: cloud-init/cloudinit/util.py
|
Index: cloud-init/cloudinit/util.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- cloud-init.orig/cloudinit/util.py
|
--- cloud-init.orig/cloudinit/util.py
|
||||||
|
@ -155,6 +155,7 @@ fi
|
|||||||
* Wed Sep 28 2011 Garrett Holmstrom <gholms@fedoraproject.org> - 0.6.2-0.6.bzr457
|
* Wed Sep 28 2011 Garrett Holmstrom <gholms@fedoraproject.org> - 0.6.2-0.6.bzr457
|
||||||
- Consolidated selinux file context patches
|
- Consolidated selinux file context patches
|
||||||
- Fixed cloud-init.service dependencies
|
- Fixed cloud-init.service dependencies
|
||||||
|
- Updated sshkeytypes patch
|
||||||
|
|
||||||
* Sat Sep 24 2011 Garrett Holmstrom <gholms@fedoraproject.org> - 0.6.2-0.5.bzr457
|
* Sat Sep 24 2011 Garrett Holmstrom <gholms@fedoraproject.org> - 0.6.2-0.5.bzr457
|
||||||
- Rebased against upstream rev 457
|
- Rebased against upstream rev 457
|
||||||
|
Loading…
Reference in New Issue
Block a user