From e601a9081ab1ca3a8014870f465d73d9b47014d7 Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Wed, 5 Jul 2023 10:17:45 +0200
Subject: [PATCH 1/3] lightdm.service: Start only on desktop

After the condition on the lightdm tag was removed, the display manager
would start on servers, too. Add condition on the desktop tag.
---
 misc_systemd_units/lightdm.service | 1 +
 1 file changed, 1 insertion(+)

diff --git a/misc_systemd_units/lightdm.service b/misc_systemd_units/lightdm.service
index aabd442..0d40786 100644
--- a/misc_systemd_units/lightdm.service
+++ b/misc_systemd_units/lightdm.service
@@ -1,5 +1,6 @@
 [Unit]
 After=systemd-user-sessions.service
+ConditionPathExists=/node/tags/desktop
 
 [Service]
 ExecStart=/usr/bin/lightdm

From 9a375fd55965d61ff4b250d8051af1e1a3c96c7f Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Wed, 5 Jul 2023 10:20:08 +0200
Subject: [PATCH 2/3] pdist-bootcheck: Keep sending "update in progress"

A synchronous pdist may take some time without anything happening on
the console. At the same time, other messages from systemd might be
emitted, scrolling the original "Update and reboot required" to a less
prominent place.

Keep sending messages at regular intervals.
---
 pdist/pdist-bootcheck | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pdist/pdist-bootcheck b/pdist/pdist-bootcheck
index 3c8e4f1..b281554 100755
--- a/pdist/pdist-bootcheck
+++ b/pdist/pdist-bootcheck
@@ -34,7 +34,8 @@ elif [ "$need_pdist_and_reboot" ]; then
         rm /var/run/updatecheck.reboot-triggered
         exit 1
     fi
-    echo "Update and reboot required. Please be patient..."
+    echo "Update and reboot required"
+    while true; do sleep 5; echo "System update in progress. Please be patient..."; done &
     netcat $(distmaster) 237
     mxgrub default
     touch /var/run/updatecheck.reboot-triggered

From 47f983a8d5eedaf99c3a05da7eed7e2beca64108 Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Wed, 5 Jul 2023 10:47:30 +0200
Subject: [PATCH 3/3] pdist-bootcheck: Run async update as transient service

Run the update as a separate service instead of as a forked
process to avoid the error message

    pdist-bootcheck.service: Failed to destroy cgroup /system.slice/pdist-bootcheck.service, ignoring: Device or resource busy

and to capture the exist status in systemd and the output in the
journal.
---
 pdist/pdist-bootcheck | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pdist/pdist-bootcheck b/pdist/pdist-bootcheck
index b281554..a2e7a49 100755
--- a/pdist/pdist-bootcheck
+++ b/pdist/pdist-bootcheck
@@ -26,7 +26,8 @@ else
 fi
 
 if [ "$need_async_pdist" ]; then
-    netcat $(distmaster) 237 >/dev/null 2>&1 </dev/null &
+    systemd-run --unit pdist-async-update --service-type=simple --remain-after-exit \
+        netcat $(distmaster) 237
     echo triggered background update
 elif [ "$need_pdist_and_reboot" ]; then
     if [[ -e /var/run/updatecheck.reboot-triggered ]]; then