Attachment 317239 Details for Bug 462382 – forgot a snippet

[patch] forgot a snippet

quit-plymouth-in-a-different-way.patch (text/plain), 2.54 KB, created by Ray Strode [halfline] on 2008-09-19 20:48:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ray Strode [halfline]

Created: 2008-09-19 20:48:07 UTC

Size: 2.54 KB

patch

obsolete

>commit c8952551c2964ab2d2f56dda2acc07a7ad22b7d9
>Author: Ray Strode <rstrode@redhat.com>
>Date:   Mon Sep 15 15:19:16 2008 -0400
>
>    quit plymouth at end of boot cycle
>
>diff --git a/event.d/quit-plymouth b/event.d/quit-plymouth
>new file mode 100644
>index 0000000..4c284ff
>--- /dev/null
>+++ b/event.d/quit-plymouth
>@@ -0,0 +1,10 @@
>+# quit-plymouth - script to stop boot splash
>+#
>+# This service triggers plymouth to quit when we reach the
>+# end of the boot cycle. prefdm handles quit differently, though.
>+
>+start on stopped rc2
>+start on stopped rc3
>+start on stopped rc4
>+
>+exec /usr/bin/plymouth quit
>diff --git a/prefdm b/prefdm
>index 3baa693..675506e 100755
>--- a/prefdm
>+++ b/prefdm
>@@ -2,20 +2,17 @@
> 
> PATH=/sbin:/usr/sbin:/bin:/usr/bin
> 
>-# shut down any graphical boot that might exist
>-if [ -x /usr/bin/rhgb-client ]; then
>-    /usr/bin/rhgb-client --quit
>-fi
>-
> # We need to source this so that the login screens get translated
> [ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
> 
> # Run preferred X display manager
>+quit_arg=
> preferred=
> if [ -f /etc/sysconfig/desktop ]; then
> 	. /etc/sysconfig/desktop
> 	if [ "$DISPLAYMANAGER" = GNOME ]; then
> 		preferred=/usr/sbin/gdm
>+		quit_arg="--retain-splash"
> 	elif [ "$DISPLAYMANAGER" = KDE ]; then
> 		preferred=/usr/bin/kdm
> 	elif [ "$DISPLAYMANAGER" = WDM ]; then
>@@ -25,8 +22,13 @@ if [ -f /etc/sysconfig/desktop ]; then
>         elif [ -n "$DISPLAYMANAGER" ]; then
> 		preferred=$DISPLAYMANAGER
> 	fi
>+else
>+	quit_arg="--retain-splash"
> fi
> 
>+# shut down boot splash
>+/usr/bin/plymouth quit $quit_arg
>+
> shopt -s execfail
> 
> [ -n "$preferred" ] && exec $preferred "$@" >/dev/null 2>&1 </dev/null
>
>commit d10ba20efb3dedc023a51e5f2f8eb70ffe122a91
>Author: Ray Strode <rstrode@redhat.com>
>Date:   Mon Sep 15 15:09:15 2008 -0400
>
>    don't unconditionally quit plymouth from rc script
>    
>    We need to pass different options depending on whether
>    gdm will run or not.
>
>diff --git a/rc.d/rc b/rc.d/rc
>index 3add4be..1bc05ae 100755
>--- a/rc.d/rc
>+++ b/rc.d/rc
>@@ -101,6 +101,3 @@ for i in /etc/rc$runlevel.d/S* ; do
> 	[ -n "$UPSTART" ] && initctl emit --quiet "started $subsys"
> done
> [ "$do_confirm" = "yes" ] && rm -f /var/run/confirm
>-if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then
>-	/usr/bin/rhgb-client --quit
>-fi
>--- initscripts-8.82/event.d/tty1.old	2008-09-19 16:44:37.000000000 -0400
>+++ initscripts-8.82/event.d/tty1	2008-09-19 16:44:51.000000000 -0400
>@@ -6,7 +6,6 @@
> start on stopped rc2
> start on stopped rc3
> start on stopped rc4
>-start on started prefdm
> 
> stop on runlevel 0
> stop on runlevel 1

Actions: View | Diff

Attachments on bug 462382: 317228 | 317239