summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorharlowja <harlowja@virtualbox.rhel>2012-06-20 00:29:51 -0700
committerharlowja <harlowja@virtualbox.rhel>2012-06-20 00:29:51 -0700
commitc431144283b6a348c761636e552c74091f4367f1 (patch)
treee736bb2b541ea6014c5cb60b9292ed18de16b145
parentc652894310e5135bcd9a3afcce9ed262e2b2adad (diff)
downloadvyos-cloud-init-c431144283b6a348c761636e552c74091f4367f1.tar.gz
vyos-cloud-init-c431144283b6a348c761636e552c74091f4367f1.zip
Ensure any authorized key file found in authorized keys is path adjusted as well
-rw-r--r--cloudinit/ssh_util.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/ssh_util.py b/cloudinit/ssh_util.py
index 96143d32..fef3d40f 100644
--- a/cloudinit/ssh_util.py
+++ b/cloudinit/ssh_util.py
@@ -244,7 +244,7 @@ def setup_user_keys(keys, user, key_prefix, paths):
akeys = akeys.replace("%%", '%')
if not akeys.startswith('/'):
akeys = os.path.join(pwent.pw_dir, akeys)
- authorized_keys = akeys
+ authorized_keys = paths.join(False, akeys)
except (IOError, OSError):
authorized_keys = os.path.join(ssh_dir, 'authorized_keys')
util.logexc(LOG, ("Failed extracting 'AuthorizedKeysFile'"