Hi,

This bug bit me again, so here is the next iteration of posting
patches… :-(

On Mon, 09 Jul 2012 21:43:09 +1200
Hugh Davenport <[email protected]> wrote:
> Just noting that if you add another architecture to your
> install then the patch from #20 will fail. Attached is a patch
> on top of that.
Thanks for your patch, but there’s two issues with it:

1) It’s in reverse order.
2) You use dpkg-architecture, which is in dpkg-dev, which is not
   installed on many computers. It’s better to use dpkg
   --print-architecture.

So, attached there is a working patch on current Debian testing with
one or more architectures configured.

Gerrit: Can you please merge this patch or provide a reason for why you
don’t want to merge it? Thanks!

Best regards,
Michael
--- debian/initramfs/dropbear-hook	2012-07-21 22:39:33.000000000 +0200
+++ /usr/share/initramfs-tools/hooks/dropbear	2012-07-21 22:38:37.318337032 +0200
@@ -27,7 +27,7 @@
 	else
 		rm -f "${DESTDIR}/sbin/dropbear"
 		copy_exec "/usr/sbin/dropbear" "/sbin/"
-		cp /lib/libnss_* "${DESTDIR}/lib/"
+		cp $(dpkg -L libc6:$(dpkg --print-architecture) | grep libnss_ | tr '\n' ' ') "${DESTDIR}/lib/"
 		echo "root:x:0:0:root:/root:/bin/sh" > "${DESTDIR}/etc/passwd"
 		for keytype in "dss" "rsa"; do
 			if [ ! -f "/etc/initramfs-tools/etc/dropbear/dropbear_${keytype}_host_key" ]; then

Reply via email to