summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-08-20 21:46:40 -0400
committerScott Moser <smoser@ubuntu.com>2012-08-20 21:46:40 -0400
commite65604ca64e16c4ee5bf2467c4424954eddfc390 (patch)
tree4f57768b02a2fd39350f72e572c526ecf6736b1a
parentabf3d804fab340aa18b1b5983f9dc69234d37cf1 (diff)
downloadvyos-cloud-init-e65604ca64e16c4ee5bf2467c4424954eddfc390.tar.gz
vyos-cloud-init-e65604ca64e16c4ee5bf2467c4424954eddfc390.zip
remove duplicate printing of authorized keys to the console
see LP: #1039303 for more information. Hopefully we'll get a good fix there.
-rw-r--r--cloudinit/config/cc_ssh_authkey_fingerprints.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/cloudinit/config/cc_ssh_authkey_fingerprints.py b/cloudinit/config/cc_ssh_authkey_fingerprints.py
index 087cc15e..ebd9d6c8 100644
--- a/cloudinit/config/cc_ssh_authkey_fingerprints.py
+++ b/cloudinit/config/cc_ssh_authkey_fingerprints.py
@@ -77,12 +77,13 @@ def _pprint_key_entries(user, key_fn, key_entries, hash_meth='md5', prefix='ci-i
authtbl_lines = authtbl_s.splitlines()
max_len = len(max(authtbl_lines, key=len))
lines = [
- util.center("Authorized keys fingerprints from %s for user %s" %
+ util.center("Authorized keys from %s for user %s" %
(key_fn, user), "+", max_len),
]
lines.extend(authtbl_lines)
for line in lines:
- util.multi_log(text="%s%s\n" % (prefix, line))
+ util.multi_log(text="%s%s\n" % (prefix, line),
+ stderr=False, console=True)
def handle(name, cfg, cloud, log, _args):