diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2016-12-08 18:33:23 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2016-12-08 18:33:23 +0000 |
| commit | d986708f386a2b0f8bda10534e90e0edbc16e366 (patch) | |
| tree | 2ae4a741fc10744eda750553d22547ebefb12280 | |
| parent | 5d7faa6592079968a60a3d7f9c5ea7ee2deb96cf (diff) | |
| download | draklive-config-d986708f386a2b0f8bda10534e90e0edbc16e366.tar draklive-config-d986708f386a2b0f8bda10534e90e0edbc16e366.tar.gz draklive-config-d986708f386a2b0f8bda10534e90e0edbc16e366.tar.bz2 draklive-config-d986708f386a2b0f8bda10534e90e0edbc16e366.tar.xz draklive-config-d986708f386a2b0f8bda10534e90e0edbc16e366.zip | |
Update prefdm patch to adapt to latest hacks in the source.
| -rw-r--r-- | patches/prefdm.patch | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/patches/prefdm.patch b/patches/prefdm.patch index 4bf61ad..3d5e129 100644 --- a/patches/prefdm.patch +++ b/patches/prefdm.patch @@ -1,11 +1,14 @@ ---- 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 @@ +--- 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 @@ -13,12 +16,13 @@ +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 -+fi ++ [ -n $(/bin/pidof plymouth) ] && [ "x$plymouth_quit" = "xyes" ] && /bin/pkill -SIGTERM plymouth + fi shopt -s execfail - |