Merge lp:~hughsaunders/cirros/dropbearinit into lp:cirros

[Hugh Saunders]

An alternative approach to https://code.launchpad.net/~hughsaunders/cirros/dropbearkey/+merge/290888

Instead of updating the patch for the dropbear init script, carry the whole script. Also moves resizefs to before dropbear in rc3.d.

[Hugh Saunders (hughsaunders)]

More code but at least the diff makes sense :/

[Scott Moser (smoser)]

we shouldnt be *so* tight that we can't write a few key files.
so i'd rather not put the resize change in place.
I realize background resize is possibly odd, but without knowing that we can resize -> 10G in sub-second, i'm not itnerested in blocking on it.

=== removed file 'patches-buildroot/dropbear-init-generate-keys.patch'
--- patches-buildroot/dropbear-init-generate-keys.patch	2015-05-28 01:28:20 +0000
+++ patches-buildroot/dropbear-init-generate-keys.patch	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-generate keys in dropbear sysvinit script
-
-buildroot upstream now uses '-R' to get their keys generated
-which is to generate them on the fly.  We'd rather they're explicitly
-generated ahead of time so that we can log them.
-Index: buildroot/package/dropbear/S50dropbear
-===================================================================
---- buildroot.orig/package/dropbear/S50dropbear	2014-09-01 11:20:56.000000000 +0000
-+++ buildroot/package/dropbear/S50dropbear	2014-09-16 19:29:54.320096000 +0000
-@@ -6,9 +6,17 @@
- # Allow a few customizations from a config file
- test -r /etc/default/dropbear && . /etc/default/dropbear
- 
-+DROPBEAR_KEYTYPES="rsa dss ecc"
- start() {
- 	DROPBEAR_ARGS="$DROPBEAR_ARGS -R"
- 
-+	local ktype file
-+	for ktype in rsa dss ecdsa; do
-+		file="/etc/dropbear/dropbear_${ktype}_host_key"
-+		cirros-per instance dropbear-keygen-$ktype -- \
-+			dropbearkey -t "$ktype" -f "$file" >/dev/null 2>&1 ||
-+		echo "WARN: generating key of type $ktype failed!"
-+	done
- 	echo -n "Starting dropbear sshd: "
- 	umask 077
- 	start-stop-daemon -S -q -p /var/run/dropbear.pid \
 
=== modified file 'patches-buildroot/series'
--- patches-buildroot/series	2015-05-08 16:34:40 +0000
+++ patches-buildroot/series	2016-04-14 14:21:38 +0000
@@ -1,2 +1,1 @@
 ifupdown-cirros.patch
-dropbear-init-generate-keys.patch
 
=== added file 'src/etc/init.d/S50dropbear'
--- src/etc/init.d/S50dropbear	1970-01-01 00:00:00 +0000
+++ src/etc/init.d/S50dropbear	2016-04-14 14:21:38 +0000
@@ -0,0 +1,68 @@
+#!/bin/sh
+#
+# Starts dropbear sshd.
+#
+
+echo "Top of dropbear init script"
+
+# Allow a few customizations from a config file
+test -r /etc/default/dropbear && . /etc/default/dropbear
+
+start() {
+	DROPBEAR_ARGS="$DROPBEAR_ARGS -R"
+
+	echo -n "Starting dropbear sshd: "
+	umask 077
+	# Ensure host keys are changed when instance ID changes
+	cirros-per instance remove-dropbear-host-keys -- rm -rf /etc/dropbear
+	
+	# Make sure dropbear directory exists
+	if [ ! -d /etc/dropbear ]; then
+		mkdir -p /etc/dropbear
+	fi
+
+	# Regenerate invalid or missing keys
+	local ktype file
+	for ktype in rsa dss ecdsa; do
+		file="/etc/dropbear/dropbear_${ktype}_host_key"
+		# -f = input file, -y = validate and print pubkey info
+		if ! dropbearkey -f "$file" -y &>/dev/null; then
+			if [ -e "$file" ]; then
+				echo "Removing invalid key: $file"
+				rm -f "$file"
+			fi
+			# -t = type (dss, rsa, ecdsa), -f = output file
+			dropbearkey -t "$ktype" -f "$file" >/dev/null 2>&1 ||
+		echo "WARN: generating key of type $ktype failed!"
+		fi
+	done
+	start-stop-daemon -S -q -p /var/run/dropbear.pid \
+		--exec /usr/sbin/dropbear -- $DROPBEAR_ARGS
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
+}
+stop() {
+	echo -n "Stopping dropbear sshd: "
+	start-stop-daemon -K -q -p /var/run/dropbear.pid
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
+}
+restart() {
+	stop
+	start
+}
+
+case "$1" in
+  start)
+  	start
+	;;
+  stop)
+  	stop
+	;;
+  restart|reload)
+  	restart
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart}"
+	exit 1
+esac
+
+exit $?
 
=== modified file 'src/etc/init.d/resizefs'
--- src/etc/init.d/resizefs	2015-05-28 19:47:25 +0000
+++ src/etc/init.d/resizefs	2016-04-14 14:21:38 +0000
@@ -1,7 +1,8 @@
 #!/bin/sh
 # vi: ts=4 noexpandtab
 
-RESIZE_MODE="background"
+echo "Top of resize init script"
+RESIZE_MODE="foreground"
 GROWROOT="enabled"
 if [ -f /etc/default/resizefs ]; then
 	. /etc/default/resizefs
 
=== added symlink 'src/etc/rc3.d/S49-resizefs'
=== target is u'../init.d/resizefs'
=== removed symlink 'src/etc/rc3.d/S55-resizefs'
=== target was u'../init.d/resizefs'