Attachment 8085 Details for Bug 17223 – Revised patch to enable xsetup scripts to run before DM starts

Revised patch to enable xsetup scripts to run before DM starts

prefdm.patch (text/plain), 964 bytes, created by Martin Whitaker on 2016-06-28 23:24:47 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Whitaker

Created: 2016-06-28 23:24:47 CEST

Size: 964 bytes

patch

obsolete

--- distrib-lzma/etc/X11/prefdm.orig	2016-06-28 19:43:36.527681311 +0100
+++ distrib-lzma/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

Actions: View

Attachments on bug 17223: 7999 | 8026 | 8085 | 8866