From 0eba2e852474c17c43576a67d39157eb991e2578 Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Fri, 5 Apr 2024 21:39:56 +0200 Subject: [PATCH] Copy only dhcpcd user into initramfs /etc/passwd Copying the complete /etc/passwd into the initramfs breaks dropbear-initramfs because the passwd file contains a root user with a non existing home directory. So copy only the dhcpcd user into initramfs `/etc/passwd`. LP: #2059739 Fixes: 22b0b82ffb35 ("Copy /etc/passwd into the initramfs to allow dhcpcd running as dhcpcd user") Signed-off-by: Benjamin Drung --- hooks/dhcpcd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hooks/dhcpcd b/hooks/dhcpcd index f42e7d17..37070ab8 100755 --- a/hooks/dhcpcd +++ b/hooks/dhcpcd @@ -26,7 +26,6 @@ fi copy_exec /usr/sbin/dhcpcd copy_exec /usr/lib/dhcpcd/dhcpcd-run-hooks -[ ! -e /etc/passwd ] || copy_file config /etc/passwd copy_file config /usr/lib/dhcpcd/dhcpcd-hooks/30-hostname copy_file config /usr/share/initramfs-tools/dhcpcd-hooks/10-mtu /usr/lib/dhcpcd/dhcpcd-hooks/10-mtu copy_file config /usr/share/initramfs-tools/dhcpcd-hooks/70-net-conf /usr/lib/dhcpcd/dhcpcd-hooks/70-net-conf @@ -49,6 +48,7 @@ slaac private duid ll env hostname_fqdn=no EOF +grep ^dhcpcd: /etc/passwd >>"${DESTDIR}/etc/passwd" || true # find the multiarch lib dir (for example /lib/x86_64-linux-gnu) multiarch_dir=$(ldd /usr/sbin/dhcpcd | sed -En 's;^.*/lib(/lib[^/]*prof)?/([^/]+)/libc\.so\..*$;\2;p') -- 2.40.1