cloud-init-dev team mailing list archive

[Dan Watkins <daniel.watkins@xxxxxxxxxxxxx>]

Dan Watkins has proposed merging lp:~daniel-thewatkins/cloud-init/lp-1437350 into lp:cloud-init.

Requested reviews:
  cloud init development team (cloud-init-dev)
Related bugs:
  Bug #1437350 in cloud-init: "cirros uses exit status 0 when trying to login as root"
  https://bugs.launchpad.net/cloud-init/+bug/1437350

For more details, see:
https://code.launchpad.net/~daniel-thewatkins/cloud-init/lp-1437350/+merge/254550
-- 
Your team cloud init development team is requested to review the proposed merge of lp:~daniel-thewatkins/cloud-init/lp-1437350 into lp:cloud-init.

=== modified file 'cloudinit/config/cc_ssh.py'
--- cloudinit/config/cc_ssh.py	2015-01-21 22:56:53 +0000
+++ cloudinit/config/cc_ssh.py	2015-03-30 09:52:13 +0000
@@ -31,7 +31,7 @@
 
 DISABLE_ROOT_OPTS = ("no-port-forwarding,no-agent-forwarding,"
 "no-X11-forwarding,command=\"echo \'Please login as the user \\\"$USER\\\" "
-"rather than the user \\\"root\\\".\';echo;sleep 10\"")
+"rather than the user \\\"root\\\".\';echo;sleep 10;exit 1\"")
 
 KEY_2_FILE = {
     "rsa_private": ("/etc/ssh/ssh_host_rsa_key", 0o600),