Merge lp:~smoser/cirros/trunk.letsplay2 into lp:cirros

[Scott Moser]

set default password to 'letsplay2'

The smiley face was hard or impossible to type in some scenarios.
The new password still pays homage to the Cubs.

[Vincent Legoll (vincent-legoll)]

OK, that's way better than cubswin:)

The "2" may pose some slight problems, but generally the numeric keys can be easier to find, either with the numeric keypad or with shift (for AZERTY mappings)...

I personally would better go to letsplay without the 2, but I don't know about that homage you speak about... :-)

What would be über cool, would be to make it customizable at image build time, by putting it cleartext in a makefile or something like that, and the src/etc/shadow entry is generated on the fly from that...

That actual change is reviewed-by: me...

Thanks

[lp:~smoser/cirros/trunk.letsplay2]

368. By Scott Moser on 2016-07-15

bin/encrypt-pass: add tool for converting plaintext to encrypted

[Scott Moser (smoser)]

Vincent, your suggestion is possible.
I just added bin/encrypt-pass:
$ ./bin/encrypt-pass gocubs
$1$ksrkfrou$zaB4gvHm7cH/o7kfzKope.

we could then modify the targets etc/shadow to have the new pass from that.

[Scott Moser (smoser)]

merged to git
https://git.launchpad.net/cirros/commit/?id=9a7c371ef329cf78f256d0a5a8f475d9c57f5477

=== modified file 'ChangeLog'
--- ChangeLog	2016-06-29 14:46:34 +0000
+++ ChangeLog	2016-07-15 14:10:26 +0000
@@ -6,6 +6,7 @@
  - growpart/growroot: resize partition while mounted with newer growpart.
    default to background resizing of root filesystem.
  - handle local subnet routes correctly (LP: #1369367)
+ - set default password to 'letsplay2' (LP: #1454144)
 0.3.4
  - Improve tooling for IPv6 and network debugging [Jens Rosenboom]
  - make 'nc -ll' work again. [Jens Rosenboom]

=== added file 'bin/encrypt-pass'
--- bin/encrypt-pass	1970-01-01 00:00:00 +0000
+++ bin/encrypt-pass	2016-07-15 14:10:26 +0000
@@ -0,0 +1,50 @@
+#!/bin/sh
+# vi: ts=4 noexpandtab
+Usage() {
+   cat <<EOF
+Usage: ${0##*/} password [format]
+
+convert password to crypt'd password suitable for /etc/shadow
+
+  format is one of:
+     md5 [default]
+     sha256
+     sha512
+EOF
+}
+
+encrypt_pass() {
+	local pass="$1" fmt="${2:-md5}" fmt_arg=""
+	case "$fmt" in
+		md5) fmt_arg='$1$';;
+		sha256) fmt_arg='$5$';;
+		sha512) fmt_arg='$6$';;
+		\$*\$) fmt_arg="$fmt";;
+	esac
+	enc=$(echo "$pass" |
+		perl -e '
+			$p=<STDIN>; chomp($p);
+			$salt = join "", map { (q(a)..q(z))[rand(26)] } 1 .. 8;
+			if (${ARGV[0]}) { $salt = "${ARGV[0]}$salt\$"; }
+			print crypt($p, "$salt") . "\n";' "$fmt_arg") || return
+	[ -n "${enc}" ] && [ "${enc#${fmt_arg}}" != "${enc}" ] &&
+		_RET="$enc"
+}
+error() { echo "$@" 1>&2; }
+fail() { [ $# -eq 0 ] || error "$@"; exit 1; }
+
+[ "$1" = "--help" -o "$1" = "-h" ] && { Usage; exit 0; }
+if ! [ $# -eq 1 -o $# -eq 2 ]; then 
+	Usage 1>&2
+	error "got $# args, expected 1 or 2"
+	exit 1
+fi
+
+password="$1"
+fmt=${2:-md5}
+if [ "$1" = "-" ]; then
+   read password || fail "failed to read password from stdin"
+fi
+
+encrypt_pass "$password" "$fmt" || fail "failed to encrypt password in '$fmt'"
+echo "$_RET"

=== modified file 'src/etc/issue'
--- src/etc/issue	2011-10-14 14:50:14 +0000
+++ src/etc/issue	2016-07-15 14:10:26 +0000
@@ -1,1 +1,1 @@
-login as 'cirros' user. default password: 'cubswin:)'. use 'sudo' for root.
+login as 'cirros' user. default password: 'letsplay2'. use 'sudo' for root.

=== modified file 'src/etc/shadow'
--- src/etc/shadow	2011-10-14 14:49:55 +0000
+++ src/etc/shadow	2016-07-15 14:10:26 +0000
@@ -1,4 +1,4 @@
-root:!$1$LJwQnqlv$DK6oKqcTq9Rf2ClC.kMa3/:10933:0:99999:7:::
+root:!$1$ssisyfpf$YqvuJLfrrW6Cg/l53Pi1n1:10933:0:99999:7:::
 bin:*:10933:0:99999:7:::
 daemon:*:10933:0:99999:7:::
 adm:*:10933:0:99999:7:::