Merge pull request #11 from CodeChenL/main

fix: common: exit plymouth before starting dm
radxa-pkg · Jun 26, 2024 · 39f6cb1 · 39f6cb1
2 parents 364c4f3 + 8eaa5de
commit 39f6cb1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/radxa-system-config-common/etc/systemd/system/gdm.service.d/00-workaround-getty-blocked.conf b/radxa-system-config-common/etc/systemd/system/gdm.service.d/00-workaround-getty-blocked.conf
@@ -0,0 +1,11 @@
+# https://wiki.archlinux.org/title/Plymouth#Smooth_transition
+# To fix getty startup being blocked when HDMI is not connected
+
+[Unit]
+Conflicts=plymouth-quit.service
+After=plymouth-quit.service rc-local.service plymouth-start.service systemd-user-sessions.service
+OnFailure=plymouth-quit.service
+
+[Service]
+ExecStartPre=-/usr/bin/plymouth deactivate
+ExecStartPost=-/usr/bin/plymouth quit --retain-splash
diff --git a/...a-system-config-common/etc/systemd/system/sddm.service.d/00-workaround-slow-shutdown.conf b/...a-system-config-common/etc/systemd/system/sddm.service.d/00-workaround-slow-shutdown.conf
@@ -0,0 +1,4 @@
+# NOTE: https://github.com/sddm/sddm/issues/1476#issuecomment-1140615746
+
+[Service]
+TimeoutStopSec=5s
diff --git a/radxa-system-config-common/etc/systemd/system/sddm.service.d/override.conf b/radxa-system-config-common/etc/systemd/system/sddm.service.d/override.conf