From 4b481315a09d4db4ec54f125be6150cc61bd0015 Mon Sep 17 00:00:00 2001
From: dataprolet <gitea@arne-bruecher.de>
Date: Wed, 1 Jul 2026 19:07:01 +0200
Subject: [PATCH] fix: move systemd-firstboot to end

---
 install.sh | 47 ++++++++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 27 deletions(-)

diff --git a/install.sh b/install.sh
index 8335c3a..cc83788 100644
--- a/install.sh
+++ b/install.sh
@@ -339,27 +339,6 @@ echo
 # https://wiki.archlinux.org/title/Installation_guide#Time
 arch-chroot "/mnt" hwclock --systohc  # Set the Hardware Clock to the current System Time
 
-# Set keymap, locale, timezone and hostname
-# https://wiki.archlinux.org/title/Systemd-firstboot
-service_dir="/mnt/etc/systemd/system/systemd-firstboot.service.d"
-mkdir "${service_dir}"
-
-rootdir="/mnt"
-keymap="de-latin1-nodeadkeys"
-locale="en_US.UTF-8"
-timezone="Europe/Berlin"
-
-cat << EOF > "${service_dir}/install.conf"
-[Service]
-ExecStart=
-ExecStart=/usr/bin/systemd-firstboot --root="${rootdir}" --keymap="${keymap}" --locale="${locale}" --timezone="${timezone}" --hostname="${host}"
-
-[Install]
-WantedBy=sysinit.target
-EOF
-
-systemctl enable systemd-firstboot
-
 ##########
 
 # Editing mkinitcpio.conf
@@ -453,12 +432,26 @@ EOF
 echo "Done."
 echo
 
-# Unmounting and rebooting
-echo "Unmounting system.."
-umount "/mnt/boot"
-umount "/mnt"
-echo "Done."
-echo
+# Set keymap, locale, timezone and hostname
+# https://wiki.archlinux.org/title/Systemd-firstboot
+service_dir="/mnt/etc/systemd/system/systemd-firstboot.service.d"
+mkdir "${service_dir}"
+
+rootdir="/mnt"
+keymap="de-latin1-nodeadkeys"
+locale="en_US.UTF-8"
+timezone="Europe/Berlin"
+
+cat << EOF > "${service_dir}/install.conf"
+[Service]
+ExecStart=
+ExecStart=/usr/bin/systemd-firstboot --root="${rootdir}" --keymap="${keymap}" --locale="${locale}" --timezone="${timezone}" --hostname="${host}"
+
+[Install]
+WantedBy=sysinit.target
+EOF
+
+systemctl enable systemd-firstboot.service
 
 clear