From 0a8f9826ceb438145e8362dbfbdcdef3600f00c5 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.com>
Date: Mon, 22 Sep 2025 09:52:38 +0100
Subject: [PATCH] stage2: Enable first boot resize and fstrim service

---
 stage2/01-sys-tweaks/01-run.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh
index be0e8cd..6da2876 100755
--- a/stage2/01-sys-tweaks/01-run.sh
+++ b/stage2/01-sys-tweaks/01-run.sh
@@ -26,14 +26,16 @@ if [ "${USE_QEMU}" = "1" ]; then
 	echo "leaving QEMU mode"
 fi
 
-on_chroot <<EOF
-for GRP in input spi i2c gpio; do
-	groupadd -f -r "\$GRP"
-done
 
-for GRP in adm dialout cdrom audio users sudo video games plugdev input gpio spi i2c netdev render; do
-  adduser $FIRST_USER_NAME \$GRP
-done
+on_chroot <<- EOF
+	systemctl enable rpi-resize
+
+	for GRP in input spi i2c gpio; do
+		groupadd -f -r "\$GRP"
+	done
+	for GRP in adm dialout cdrom audio users sudo video games plugdev input gpio spi i2c netdev render; do
+		adduser $FIRST_USER_NAME \$GRP
+	done
 EOF
 
 if [ -f "${ROOTFS_DIR}/etc/sudoers.d/010_pi-nopasswd" ]; then