summaryrefslogtreecommitdiffstats
path: root/patches/prefdm.patch
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2016-11-12 19:06:31 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2016-11-12 19:06:31 +0000
commitb6a40abe0a9f4127a1def0ac5b5667e963eebd80 (patch)
tree54f460623f385ae9163491649ddccc58131dd703 /patches/prefdm.patch
parent05625dbf3ab9345db60dd1a5c9ca76e4f545ac36 (diff)
downloaddraklive-config-b6a40abe0a9f4127a1def0ac5b5667e963eebd80.tar
draklive-config-b6a40abe0a9f4127a1def0ac5b5667e963eebd80.tar.gz
draklive-config-b6a40abe0a9f4127a1def0ac5b5667e963eebd80.tar.bz2
draklive-config-b6a40abe0a9f4127a1def0ac5b5667e963eebd80.tar.xz
draklive-config-b6a40abe0a9f4127a1def0ac5b5667e963eebd80.zip
Temporarily add patches for mga#17223, mga#19517, mga#19520.
Diffstat (limited to 'patches/prefdm.patch')
-rw-r--r--patches/prefdm.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/patches/prefdm.patch b/patches/prefdm.patch
new file mode 100644
index 0000000..4bf61ad
--- /dev/null
+++ b/patches/prefdm.patch
@@ -0,0 +1,24 @@
+--- etc/X11/prefdm.orig 2016-06-28 19:43:36.527681311 +0100
++++ etc/X11/prefdm 2016-06-28 19:48:32.634631468 +0100
+@@ -62,8 +62,19 @@
+ fi
+ fi
+
+-# shut down boot splash
+-[ -x /bin/plymouth ] && [ "x$plymouth_quit" = "xyes" ] && /bin/plymouth quit
++[ -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
++ # 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
++fi
+
+ shopt -s execfail
+