From b0316ae8706e3abe0d4bd2bdf1cda976a6e2e6a7 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.com>
Date: Fri, 18 Mar 2022 17:03:26 +0000
Subject: [PATCH] Enable userconf-pi on first boot

---
 export-image/01-user-rename/00-packages                     | 1 +
 export-image/01-user-rename/01-run.sh                       | 5 +++++
 export-image/{01-set-sources => 02-set-sources}/01-run.sh   | 0
 export-image/{02-network => 03-network}/01-run.sh           | 0
 export-image/{02-network => 03-network}/files/resolv.conf   | 0
 export-image/{03-set-partuuid => 04-set-partuuid}/00-run.sh | 0
 export-image/{04-finalise => 05-finalise}/01-run.sh         | 0
 7 files changed, 6 insertions(+)
 create mode 100644 export-image/01-user-rename/00-packages
 create mode 100755 export-image/01-user-rename/01-run.sh
 rename export-image/{01-set-sources => 02-set-sources}/01-run.sh (100%)
 rename export-image/{02-network => 03-network}/01-run.sh (100%)
 rename export-image/{02-network => 03-network}/files/resolv.conf (100%)
 rename export-image/{03-set-partuuid => 04-set-partuuid}/00-run.sh (100%)
 rename export-image/{04-finalise => 05-finalise}/01-run.sh (100%)

diff --git a/export-image/01-user-rename/00-packages b/export-image/01-user-rename/00-packages
new file mode 100644
index 0000000..e8b69fc
--- /dev/null
+++ b/export-image/01-user-rename/00-packages
@@ -0,0 +1 @@
+userconf-pi
diff --git a/export-image/01-user-rename/01-run.sh b/export-image/01-user-rename/01-run.sh
new file mode 100755
index 0000000..8a5617b
--- /dev/null
+++ b/export-image/01-user-rename/01-run.sh
@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+	SUDO_USER="${FIRST_USER_NAME}" rename-user -f -s
+EOF
diff --git a/export-image/01-set-sources/01-run.sh b/export-image/02-set-sources/01-run.sh
similarity index 100%
rename from export-image/01-set-sources/01-run.sh
rename to export-image/02-set-sources/01-run.sh
diff --git a/export-image/02-network/01-run.sh b/export-image/03-network/01-run.sh
similarity index 100%
rename from export-image/02-network/01-run.sh
rename to export-image/03-network/01-run.sh
diff --git a/export-image/02-network/files/resolv.conf b/export-image/03-network/files/resolv.conf
similarity index 100%
rename from export-image/02-network/files/resolv.conf
rename to export-image/03-network/files/resolv.conf
diff --git a/export-image/03-set-partuuid/00-run.sh b/export-image/04-set-partuuid/00-run.sh
similarity index 100%
rename from export-image/03-set-partuuid/00-run.sh
rename to export-image/04-set-partuuid/00-run.sh
diff --git a/export-image/04-finalise/01-run.sh b/export-image/05-finalise/01-run.sh
similarity index 100%
rename from export-image/04-finalise/01-run.sh
rename to export-image/05-finalise/01-run.sh