Gerrit Pape wrote:
include your patch as soon as you say it's ready, and request its
inclusion.

ahgreat. i attached an updated diff, and i'd request resp. suggest to include 
it, it just adds the behaviour regarding an authorized_keys template, and no 
functionality is removed.
so i'll submit the updated documentation next.

thanks!

        Chris
--- /usr/share/initramfs-tools/hooks/dropbear	2009-09-30 17:54:01.000000000 +0200
+++ dropbear	2009-09-30 17:53:30.000000000 +0200
@@ -36,14 +36,17 @@ if [ "${DROPBEAR}" = "y" ] || ( [ "${DRO
 			fi
 		done
 		cp -R /etc/initramfs-tools/etc/dropbear "${DESTDIR}/etc/"
-		if [ ! -f "/etc/initramfs-tools/root/.ssh/id_rsa.pub" ]; then
+		if [ ! -f "/etc/initramfs-tools/root/.ssh/authorized_keys" ]; then
 			mkdir -p "/etc/initramfs-tools/root/.ssh"
-			dropbearkey -t rsa -f /etc/initramfs-tools/root/.ssh/id_rsa.dropbear
-			/usr/lib/dropbear/dropbearconvert dropbear openssh /etc/initramfs-tools/root/.ssh/id_rsa.dropbear /etc/initramfs-tools/root/.ssh/id_rsa
-			dropbearkey -y -f /etc/initramfs-tools/root/.ssh/id_rsa.dropbear | grep "^ssh-rsa " > /etc/initramfs-tools/root/.ssh/id_rsa.pub
+			if [ ! -f "/etc/initramfs-tools/root/.ssh/id_rsa.pub" ]; then
+				dropbearkey -t rsa -f /etc/initramfs-tools/root/.ssh/id_rsa.dropbear
+				/usr/lib/dropbear/dropbearconvert dropbear openssh /etc/initramfs-tools/root/.ssh/id_rsa.dropbear /etc/initramfs-tools/root/.ssh/id_rsa
+				dropbearkey -y -f /etc/initramfs-tools/root/.ssh/id_rsa.dropbear | grep "^ssh-rsa " > /etc/initramfs-tools/root/.ssh/id_rsa.pub
+			fi
+			cat /etc/initramfs-tools/root/.ssh/id_rsa.pub >> /etc/initramfs-tools/root/.ssh/authorized_keys
 		fi
 		mkdir -p "${DESTDIR}/root/.ssh"
-		cp /etc/initramfs-tools/root/.ssh/id_rsa.pub "${DESTDIR}/root/.ssh/authorized_keys"
+		cp /etc/initramfs-tools/root/.ssh/authorized_keys "${DESTDIR}/root/.ssh/"
 	fi
 fi
 

Reply via email to