From: Miklos Vajna <vmiklos@frugalware.org>
Date: Sun, 8 May 2011 11:32:38 +0000 (+0200)
Subject: units: Enable plymouth for Frugalware
X-Git-Tag: v27~21
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=34a852e6f9efe139c0d442d9fa3a9a29fa3b6545

units: Enable plymouth for Frugalware
---

diff --git a/configure.ac b/configure.ac
index dcd4b9dd6..4a5610111 100644
--- a/configure.ac
+++ b/configure.ac
@@ -356,6 +356,7 @@ case $with_distro in
                 SYSTEM_SYSVINIT_PATH=/etc/rc.d
                 AC_DEFINE(TARGET_FRUGALWARE, [], [Target is Frugalware])
                 M4_DISTRO_FLAG=-DTARGET_FRUGALWARE=1
+                have_plymouth=true
                 ;;
         altlinux)
                 SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
diff --git a/units/frugalware/display-manager.service b/units/frugalware/display-manager.service
index a092c56de..e61422587 100644
--- a/units/frugalware/display-manager.service
+++ b/units/frugalware/display-manager.service
@@ -9,9 +9,6 @@
 Description=Display Manager
 After=syslog.target local.service systemd-user-sessions.service
 
-Conflicts=splashy-quit.service
-After=splashy-quit.service
-
 [Service]
 EnvironmentFile=/etc/sysconfig/desktop
 ExecStart=/bin/bash -c "exec ${desktop}"