summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2011-01-19 03:53:53 +0000
committerScott Moser <smoser@ubuntu.com>2011-01-19 03:53:53 +0000
commitbfbda7907b261bd3f7e2731aec50dbdeb76489e2 (patch)
tree238500aa8c8fc776913211fa4944e143cbb518e7
parent8fbafbddbfbdddcb0a3e087185e432973ac73baa (diff)
downloadvyos-cloud-init-bfbda7907b261bd3f7e2731aec50dbdeb76489e2.tar.gz
vyos-cloud-init-bfbda7907b261bd3f7e2731aec50dbdeb76489e2.zip
make 'do not login as root' message more clear.
When the user attempts login as root, they see a message suggesting a different user. This changes that message from: Please login as the ubuntu user rather than root user. to Please login as the user "ubuntu" rather than the user "root". LP: #672417
-rw-r--r--cloudinit/CloudConfig/cc_ssh.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/CloudConfig/cc_ssh.py b/cloudinit/CloudConfig/cc_ssh.py
index 682875a2..7b9ba5ab 100644
--- a/cloudinit/CloudConfig/cc_ssh.py
+++ b/cloudinit/CloudConfig/cc_ssh.py
@@ -68,7 +68,7 @@ def apply_credentials(keys, user, disable_root):
setup_user_keys(keys, user, '')
if disable_root:
- key_prefix = 'command="echo \'Please login as the %s user rather than root user.\';echo;sleep 10" ' % user
+ key_prefix = 'command="echo \'Please login as the user \\\"%s\\\" rather than the user \\\"root\\\".\';echo;sleep 10" ' % user
else:
key_prefix = ''