cloud-init

Merge lp:~oddbloke/cloud-init/lp-1437350 into lp:~cloud-init-dev/cloud-init/trunk

  1. lp-1437350
  2. Merge into trunk
Proposed by Dan Watkins
Status: Rejected
Rejected by: Dan Watkins
Proposed branch: lp:~oddbloke/cloud-init/lp-1437350
Merge into: lp:~cloud-init-dev/cloud-init/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
cloudinit/config/cc_ssh.py (+1/-1)
To merge this branch: bzr merge lp:~oddbloke/cloud-init/lp-1437350
Reviewer Review Type Date Requested Status
Dan Watkins Disapprove
Joshua Harlow (community) Approve
Review via email: mp+254550@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Joshua Harlow (harlowja) :
review: Approve
Revision history for this message
Dan Watkins (oddbloke) wrote :

To avoid problems with backwards compatibility and breaking users, this will be considered for cloud-init 2.0.

Note to selves: we should consider exiting with an error code that SSH wouldn't use for transport errors, so people can distinguish.

review: Disapprove

Unmerged revisions

1088. By Dan Watkins

Exit 1 when informing users that they shouldn't SSH as root.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cloudinit/config/cc_ssh.py'
2--- cloudinit/config/cc_ssh.py 2015-01-21 22:56:53 +0000
3+++ cloudinit/config/cc_ssh.py 2015-03-30 09:52:13 +0000
4@@ -31,7 +31,7 @@
5
6 DISABLE_ROOT_OPTS = ("no-port-forwarding,no-agent-forwarding,"
7 "no-X11-forwarding,command=\"echo \'Please login as the user \\\"$USER\\\" "
8-"rather than the user \\\"root\\\".\';echo;sleep 10\"")
9+"rather than the user \\\"root\\\".\';echo;sleep 10;exit 1\"")
10
11 KEY_2_FILE = {
12 "rsa_private": ("/etc/ssh/ssh_host_rsa_key", 0o600),