From 32f1432af8a25141ecb09405fa2b4214a984ecec Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 28 Feb 2017 22:05:17 +0000
Subject: live.cfg: drop prefdm patch (now applied in initscripts package).

---
 config/live.cfg      |  2 --
 patches/prefdm.patch | 28 ----------------------------
 2 files changed, 30 deletions(-)
 delete mode 100644 patches/prefdm.patch

diff --git a/config/live.cfg b/config/live.cfg
index 6404960..836b0d2 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -126,8 +126,6 @@ my $_l = {
         ],
         patches => [
 	    # Temporary patches waiting to be applied to mga packages
-	    # mga#17223
-	    'patches/prefdm.patch',
 	    # mga#19520
 	    'patches/dkms.patch',
         ],
diff --git a/patches/prefdm.patch b/patches/prefdm.patch
deleted file mode 100644
index 3d5e129..0000000
--- a/patches/prefdm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- etc/X11/prefdm.orig	2016-12-03 11:24:23.000098955 +0000
-+++ etc/X11/prefdm	2016-12-03 11:57:02.061026971 +0000
-@@ -67,11 +67,20 @@
- 	fi
- fi
- 
--# shut down boot splash
--[ -x /bin/plymouth ] && [ "x$plymouth_quit" = "xyes" ] && /bin/plymouth quit
--# force shut down boot splash if not yet done
--if [ -n $(/bin/pidof plymouth) ]; then
--	/bin/pkill -SIGTERM plymouth
-+[ -f /etc/sysconfig/firstboot ] && . /etc/sysconfig/firstboot
-+[ -f /etc/sysconfig/finish-install ] && . /etc/sysconfig/finish-install
-+grep -q '\binstall\b' /proc/cmdline
-+RETVAL=$?
-+if  [ \( "x$FINISH_INSTALL" = "xyes" -a -x /usr/sbin/finish-install \) -o \( "x$FIRSTBOOT" = "xyes" -a -x /usr/bin/mozilla-firefox \) -o \( $RETVAL = 0 \)  ]; then
-+  # unconditionally shut down boot splash
-+  [ -x /bin/plymouth ] && /bin/plymouth quit
-+  [ -n $(/bin/pidof plymouth) ] && /bin/pkill -SIGTERM plymouth
-+  # and run first-time actions
-+  /usr/bin/xinit /etc/X11/xdm/Xsetup_0
-+else
-+  # shut down boot splash for DMs that don't handle it themselves
-+  [ -x /bin/plymouth ] && [ "x$plymouth_quit" = "xyes" ] && /bin/plymouth quit
-+  [ -n $(/bin/pidof plymouth) ] && [ "x$plymouth_quit" = "xyes" ] && /bin/pkill -SIGTERM plymouth
- fi
- 
- shopt -s execfail
-- 
cgit v1.2.1