From 0f9150b150d8167b7670625ed4d33d41069eb1b9 Mon Sep 17 00:00:00 2001
From: Ruud Peters <ruud_peters96@hotmail.com>
Date: Sun, 24 Mar 2024 22:22:57 +0000
Subject: [PATCH] removed user 'pi' completely

---
 .github/workflows/main.yml |  5 ++++-
 dockerfile                 | 10 ++++++----
 src/conf/shadow            | 27 ---------------------------
 3 files changed, 10 insertions(+), 32 deletions(-)
 delete mode 100644 src/conf/shadow

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cc62baf..bbf6f15 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -80,6 +80,7 @@ jobs:
       - name: Check for Tag
         id: check
         run: |
+          git fetch --tags
           if [[ ! -z "$(git tag --contains HEAD)" ]]; then
             echo "publish=true" >> $GITHUB_OUTPUT
           fi
@@ -94,7 +95,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set tag variable
-        run: echo "TAG=${git tag --contains HEAD}" >> $GITHUB_ENV
+        run: |
+          git fetch --tags
+          echo "TAG=$(git tag --contains HEAD)" >> $GITHUB_ENV
 
       - name: Cache register
         id: cache
diff --git a/dockerfile b/dockerfile
index 8070a11..379e9b5 100644
--- a/dockerfile
+++ b/dockerfile
@@ -75,10 +75,12 @@ RUN touch /mnt/boot/ssh
 RUN sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /mnt/root/etc/ssh/sshd_config \
  && sed -i 's/#PermitEmptyPasswords no/permitEmptyPasswords yes/' /mnt/root/etc/ssh/sshd_config
 
-# Set user configuration
-COPY src/conf/shadow /mnt/root/etc/
-# Remove default user home
-RUN rm -r /mnt/root/home/pi
+# Enable root login and remove user 'pi'
+RUN sed -i 's/^root:\*:/root::/' /mnt/root/etc/shadow \
+ && sed -i '/^pi/d' /mnt/root/etc/shadow \
+ && sed -i '/^pi/d' /mnt/root/etc/passwd \
+ && sed -i '/^pi/d' /mnt/root/etc/group \
+ && rm -r /mnt/root/home/pi
 
 # Setup root auto login
 RUN mkdir /mnt/root/etc/systemd/system/serial-getty@ttyAMA0.service.d/
diff --git a/src/conf/shadow b/src/conf/shadow
deleted file mode 100644
index b2a5fc7..0000000
--- a/src/conf/shadow
+++ /dev/null
@@ -1,27 +0,0 @@
-root::19640:0:99999:7:::
-daemon:*:19640:0:99999:7:::
-bin:*:19640:0:99999:7:::
-sys:*:19640:0:99999:7:::
-sync:*:19640:0:99999:7:::
-games:*:19640:0:99999:7:::
-man:*:19640:0:99999:7:::
-lp:*:19640:0:99999:7:::
-mail:*:19640:0:99999:7:::
-news:*:19640:0:99999:7:::
-uucp:*:19640:0:99999:7:::
-proxy:*:19640:0:99999:7:::
-www-data:*:19640:0:99999:7:::
-backup:*:19640:0:99999:7:::
-list:*:19640:0:99999:7:::
-irc:*:19640:0:99999:7:::
-_apt:*:19640:0:99999:7:::
-nobody:*:19640:0:99999:7:::
-systemd-network:!*:19640::::::
-systemd-timesync:!*:19640::::::
-messagebus:!:19640::::::
-_rpc:!:19640::::::
-sshd:!:19640::::::
-statd:!:19640::::::
-avahi:!:19640::::::
-polkitd:!*:19640::::::
-dnsmasq:!:19640::::::