From 95ac3cfb3b223dad058c1aee1d8b6e3f5e5b5935 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.com>
Date: Fri, 18 Mar 2022 15:03:23 +0000
Subject: [PATCH 1/4] Remove default password

---
 README.md                      | 4 ++--
 build.sh                       | 2 +-
 stage1/01-sys-tweaks/00-run.sh | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3cab6ec..2ef35e8 100644
--- a/README.md
+++ b/README.md
@@ -179,9 +179,9 @@ The following environment variables are supported:
 
    Username for the first user
 
- * `FIRST_USER_PASS` (Default: "raspberry")
+ * `FIRST_USER_PASS` (Default: unset)
 
-   Password for the first user
+   Password for the first user. If unset, the account is locked.
 
  * `WPA_ESSID`, `WPA_PASSWORD` and `WPA_COUNTRY` (Default: unset)
 
diff --git a/build.sh b/build.sh
index 4b75e79..014035c 100755
--- a/build.sh
+++ b/build.sh
@@ -224,7 +224,7 @@ export LOG_FILE="${WORK_DIR}/build.log"
 export TARGET_HOSTNAME=${TARGET_HOSTNAME:-raspberrypi}
 
 export FIRST_USER_NAME=${FIRST_USER_NAME:-pi}
-export FIRST_USER_PASS=${FIRST_USER_PASS:-raspberry}
+export FIRST_USER_PASS
 export RELEASE=${RELEASE:-bullseye}
 export WPA_ESSID
 export WPA_PASSWORD
diff --git a/stage1/01-sys-tweaks/00-run.sh b/stage1/01-sys-tweaks/00-run.sh
index 9c380ec..0f761bd 100755
--- a/stage1/01-sys-tweaks/00-run.sh
+++ b/stage1/01-sys-tweaks/00-run.sh
@@ -8,7 +8,10 @@ on_chroot << EOF
 if ! id -u ${FIRST_USER_NAME} >/dev/null 2>&1; then
 	adduser --disabled-password --gecos "" ${FIRST_USER_NAME}
 fi
-echo "${FIRST_USER_NAME}:${FIRST_USER_PASS}" | chpasswd
+
+if [ -n "${FIRST_USER_PASS}" ]; then
+	echo "${FIRST_USER_NAME}:${FIRST_USER_PASS}" | chpasswd
+fi
 echo "root:root" | chpasswd
 EOF
 

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 2/4] 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

From 09ebc77e6b6dac3892ab09242fe39eec892abe93 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.com>
Date: Mon, 21 Mar 2022 11:48:11 +0000
Subject: [PATCH 3/4] stage4: Install rpi-imager

---
 stage4/00-install-packages/00-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages
index e76d411..4e9519f 100644
--- a/stage4/00-install-packages/00-packages
+++ b/stage4/00-install-packages/00-packages
@@ -23,3 +23,4 @@ piwiz
 rp-prefapps
 ffmpeg
 vlc
+rpi-imager

From 1b635daf30b70dd43a3b6ba15da222a35b9b1666 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.com>
Date: Mon, 21 Mar 2022 11:48:20 +0000
Subject: [PATCH 4/4] stage4: Install rpi-wayland

---
 stage4/00-install-packages/00-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages
index 4e9519f..7854596 100644
--- a/stage4/00-install-packages/00-packages
+++ b/stage4/00-install-packages/00-packages
@@ -24,3 +24,4 @@ rp-prefapps
 ffmpeg
 vlc
 rpi-imager
+rpi-wayland