From 0496adc50425c70eeae3adc241aad5dc5d6bc8af Mon Sep 17 00:00:00 2001
From: Alexey Shabalin <shaba@altlinux.org>
Date: Mon, 25 Feb 2019 02:37:04 +0300
Subject: [PATCH] Add drop-in config to DM unit for run DM after plymouth-quit.

All moderm DM, like gdm, sddm, lightdm have a aliase to
display-manager.service.
[Install]
Alias=display-manager.service

plymouth-quit.conf
[Unit]
After=plymouth-quit.service

in $systemdunitdir/display-manager.service.d allow
run DM after stop plymouth.
---
 systemd-units/Makefile.am        | 15 +++++++++++----
 systemd-units/plymouth-quit.conf |  2 ++
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 systemd-units/plymouth-quit.conf

diff --git a/systemd-units/Makefile.am b/systemd-units/Makefile.am
index b1d843b6..379ca230 100644
--- a/systemd-units/Makefile.am
+++ b/systemd-units/Makefile.am
@@ -11,9 +11,14 @@ systemd_unit_templates =                                                     \
         systemd-ask-password-plymouth.path.in                                \
         systemd-ask-password-plymouth.service.in
 
+systemd_display_manager_conf =                                               \
+        plymouth-quit.conf
+
 if ENABLE_SYSTEMD_INTEGRATION
 systemdunitdir=$(SYSTEMD_UNIT_DIR)
 systemdunit_DATA = $(systemd_unit_templates:.in=)
+dmconfdir = $(SYSTEMD_UNIT_DIR)/display-manager.service.d
+dmconf_DATA = $(systemd_display_manager_conf)
 
 install-data-hook:
 	$(MKDIR_P) -m 0755                                                   \
@@ -23,7 +28,8 @@ install-data-hook:
 		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/reboot.target.wants            \
 		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/kexec.target.wants             \
 		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/poweroff.target.wants          \
-		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants
+		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants              \
+		$(DESTDIR)$(dmconfdir)
 	(cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/initrd-switch-root.target.wants && \
 		rm -f plymouth-start.service plymouth-switch-root.service && \
 		$(LN_S) ../plymouth-start.service &&                         \
@@ -70,9 +76,10 @@ uninstall-hook:
 		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/reboot.target.wants            \
 		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/kexec.target.wants             \
 		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/poweroff.target.wants          \
-		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants
+		$(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants              \
+		$(DESTDIR)$(dmconfdir)
 
 endif
 
-EXTRA_DIST = $(systemd_unit_templates) $(systemdunit_DATA)
-DISTCLEANFILES=$(systemdunit_DATA)
+EXTRA_DIST = $(systemd_unit_templates) $(systemdunit_DATA) $(dmconf_DATA)
+DISTCLEANFILES=$(systemdunit_DATA) $(dmconf_DATA)
diff --git a/systemd-units/plymouth-quit.conf b/systemd-units/plymouth-quit.conf
new file mode 100644
index 00000000..fb0e46c8
--- /dev/null
+++ b/systemd-units/plymouth-quit.conf
@@ -0,0 +1,2 @@
+[Unit]
+After=plymouth-quit.service
-- 
GitLab