From df1fb21c019bc94389b765e997588b7276e1c1c1 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Sun, 18 Jun 2023 20:28:50 +0200
Subject: [PATCH] more stopping services by hand

---
 usr/lib/archboot/login.sh                             | 3 +++
 usr/lib/archboot/update-installer/update-installer.sh | 1 +
 2 files changed, 4 insertions(+)

diff --git a/usr/lib/archboot/login.sh b/usr/lib/archboot/login.sh
index b7fb9ef60..ac80186b2 100644
--- a/usr/lib/archboot/login.sh
+++ b/usr/lib/archboot/login.sh
@@ -60,6 +60,9 @@ if [[ "${TTY}" = "tty1" ]]; then
     echo -e "\e[1;96mArchboot\e[m \e[1m- Arch Linux Environment finished.\e[m"
     echo -e "\e[1mSystemd initrd-switch-root will be launched in a second...\e[m"
     read -r -t 3
+    systemctl stop systemd-user-sessions.service
+    systemctl stop dbus-org.freedesktop.login1.service
+    systemctl stop dbus.service
     systemctl start initrd-switch-root.target
 else
     while true; do
diff --git a/usr/lib/archboot/update-installer/update-installer.sh b/usr/lib/archboot/update-installer/update-installer.sh
index 03acd5c66..87f7ce0c2 100644
--- a/usr/lib/archboot/update-installer/update-installer.sh
+++ b/usr/lib/archboot/update-installer/update-installer.sh
@@ -388,6 +388,7 @@ _new_environment() {
         rm -f /sysroot/{VERSION,config,buildconfig,init} &>/dev/null
         # systemd needs this for root_switch
         touch /etc/initrd-release
+        systemctl stop dbus.service
         systemctl start initrd-switch-root.target
     fi
     echo -e "\e[1mStep ${_S_APPEND}7/${_STEPS}:\e[m Creating initramfs ${_RAM}/${_INITRD}..."