Merge pull request #331 from mariux64/fixes

Fixup (dont start lightdm on servers, minor pdist-bootcheck changes)
mariux64 · Jul 5, 2023 · 21e3111 · 21e3111
2 parents 3e21c9d + 47f983a
commit 21e3111
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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

diff --git a/pdist/pdist-bootcheck b/pdist/pdist-bootcheck
@@ -26,15 +26,17 @@ 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
         echo "Update and reboot required but prevented due to previous attempt"
         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