Attachment 8866 Details for Bug 17223 – Updated patch to enable xsetup scripts to run before DM starts

Updated patch to enable xsetup scripts to run before DM starts

prefdm.patch (text/plain), 1.19 KB, created by Martin Whitaker on 2017-01-17 18:46:48 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Whitaker

Created: 2017-01-17 18:46:48 CET

Size: 1.19 KB

patch

obsolete

>--- 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

--- 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

Actions: View

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