[cloud-init/f16] Update sshkeytypes patch
gholms
gholms at fedoraproject.org
Tue Oct 4 19:22:20 UTC 2011
commit f354744043bbb53b28e54b577d4a83d74ecb9768
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date: Wed Sep 28 18:15:39 2011 -0700
Update sshkeytypes patch
cloud-init-0.6.2-sshkeytypes.patch | 21 +++++++++++++++++++++
cloud-init.spec | 1 +
2 files changed, 22 insertions(+), 0 deletions(-)
---
diff --git a/cloud-init-0.6.2-sshkeytypes.patch b/cloud-init-0.6.2-sshkeytypes.patch
index f2abe09..3b18ed5 100644
--- a/cloud-init-0.6.2-sshkeytypes.patch
+++ b/cloud-init-0.6.2-sshkeytypes.patch
@@ -2,6 +2,15 @@ Index: cloud-init/cloudinit/CloudConfig/cc_ssh.py
===================================================================
--- cloud-init.orig/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):
log.debug("generated %s from %s" % pair)
else:
@@ -17,6 +26,18 @@ Index: cloud-init/cloudinit/CloudConfig/cc_ssh.py
try:
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
===================================================================
--- cloud-init.orig/cloudinit/util.py
diff --git a/cloud-init.spec b/cloud-init.spec
index ea7b27b..7832d53 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -155,6 +155,7 @@ fi
* Wed Sep 28 2011 Garrett Holmstrom <gholms at fedoraproject.org> - 0.6.2-0.6.bzr457
- Consolidated selinux file context patches
- Fixed cloud-init.service dependencies
+- Updated sshkeytypes patch
* Sat Sep 24 2011 Garrett Holmstrom <gholms at fedoraproject.org> - 0.6.2-0.5.bzr457
- Rebased against upstream rev 457
More information about the scm-commits
mailing list