From 4de913c1fff28adde5681a5258978f6bfaa880b6 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.com>
Date: Tue, 14 Jun 2022 10:47:34 +0100
Subject: [PATCH] Modify 010_pi-nopasswd to match FIRST_USER_NAME

https://github.com/RPi-Distro/raspberrypi-sys-mods/issues/62#issuecomment-1148443217=
---
 stage2/01-sys-tweaks/01-run.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh
index bb3e11a..294a0ec 100755
--- a/stage2/01-sys-tweaks/01-run.sh
+++ b/stage2/01-sys-tweaks/01-run.sh
@@ -57,6 +57,10 @@ for GRP in adm dialout cdrom audio users sudo video games plugdev input gpio spi
 done
 EOF
 
+if [ -f "${ROOTFS_DIR}/etc/sudoers.d/010_pi-nopasswd" ]; then
+  sed -i "s/^pi /$FIRST_USER_NAME /" "${ROOTFS_DIR}/etc/sudoers.d/010_pi-nopasswd"
+fi
+
 on_chroot << EOF
 setupcon --force --save-only -v
 EOF