From 0640cdafdaa7c251ff607fc9c59c032ead353dab Mon Sep 17 00:00:00 2001
From: Roland <roland@learningselfreliance.com>
Date: Mon, 17 Jun 2024 17:59:49 -0600
Subject: [PATCH] Removing pi user requirement from pi build process and repair
 script.

---
 pi-gen/config.txt                        |  3 ---
 pi-gen/stage2/04-wrolpi/03-run-chroot.sh |  8 --------
 pi-gen/stage2/04-wrolpi/04-run-chroot.sh | 10 +++-------
 repair.sh                                |  4 ----
 4 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/pi-gen/config.txt b/pi-gen/config.txt
index 560d312b..83dc0df1 100644
--- a/pi-gen/config.txt
+++ b/pi-gen/config.txt
@@ -5,8 +5,5 @@ LOCALE_DEFAULT=en_US.UTF-8
 TARGET_HOSTNAME=wrolpi
 KEYBOARD_KEYMAP=en_US
 KEYBOARD_LAYOUT="English (US)"
-FIRST_USER_NAME=pi
-FIRST_USER_PASS=wrolpi
-DISABLE_FIRST_BOOT_USER_RENAME=1
 ENABLE_SSH=1
 DEPLOY_COMPRESSION=xz
diff --git a/pi-gen/stage2/04-wrolpi/03-run-chroot.sh b/pi-gen/stage2/04-wrolpi/03-run-chroot.sh
index a02b5df4..934cdf87 100755
--- a/pi-gen/stage2/04-wrolpi/03-run-chroot.sh
+++ b/pi-gen/stage2/04-wrolpi/03-run-chroot.sh
@@ -33,14 +33,6 @@ python3 -m venv /opt/wrolpi/venv
 # Install webapp.
 (cd /opt/wrolpi/app && npm install && npm run build)
 
-# Add wrolpi database password to pi user
-cat >/home/pi/.pgpass <<'EOF'
-127.0.0.1:5432:gis:_renderd:wrolpi
-127.0.0.1:5432:wrolpi:wrolpi:wrolpi
-EOF
-chown -R pi:pi /home/pi
-chmod 0600 /home/pi/.pgpass
-
 chown -R wrolpi:wrolpi /opt/wrolpi
 
 # Configure nginx.
diff --git a/pi-gen/stage2/04-wrolpi/04-run-chroot.sh b/pi-gen/stage2/04-wrolpi/04-run-chroot.sh
index 169910a8..3b8fc8b5 100755
--- a/pi-gen/stage2/04-wrolpi/04-run-chroot.sh
+++ b/pi-gen/stage2/04-wrolpi/04-run-chroot.sh
@@ -11,17 +11,13 @@ chown -R wrolpi:wrolpi /opt/openstreetmap-carto
 (cd /opt/openstreetmap-carto && carto project.mml >/opt/openstreetmap-carto/mapnik.xml)
 
 # WROLPi user can access WROLPi and Map database.
-mkdir -p /home/pi/Desktop
-cat >/home/pi/.pgpass <<'EOF'
+cat >/etc/skel/.pgpass <<'EOF'
 127.0.0.1:5432:gis:_renderd:wrolpi
 127.0.0.1:5432:wrolpi:wrolpi:wrolpi
 EOF
 # Update desktop shortcuts.
-cp /opt/wrolpi/etc/raspberrypios/*desktop /home/pi/Desktop/
-# Fix permissions.
-chown -R pi:pi /home/pi
-chmod 0600 /home/pi/.pgpass
-usermod -aG wrolpi pi
+mkdir /etc/skel/Desktop
+cp /opt/wrolpi/etc/raspberrypios/*desktop /etc/skel/Desktop
 
 # Configure renderd.
 cp /opt/wrolpi/etc/raspberrypios/renderd.conf /etc/renderd.conf
diff --git a/repair.sh b/repair.sh
index a56e0f34..99c1612a 100755
--- a/repair.sh
+++ b/repair.sh
@@ -47,10 +47,6 @@ if [[ ! -f /etc/nginx/cert.crt || ! -f /etc/nginx/cert.key ]]; then
   chmod 640 /etc/nginx/cert.key /etc/nginx/cert.crt
 fi
 
-# Update desktop shortcuts.
-cp /opt/wrolpi/etc/raspberrypios/*desktop /home/pi/Desktop/
-chown pi:pi /home/pi/Desktop/*desktop
-
 # WROLPi needs a few privileged commands.
 cp /opt/wrolpi/etc/raspberrypios/90-wrolpi /etc/sudoers.d/90-wrolpi
 chmod 0440 /etc/sudoers.d/90-wrolpi