Attachment 221991 Details for Bug 287941 – suggested patch to make xinitrc use the wrapper

suggested patch to make xinitrc use the wrapper

xinitrc.patch (text/plain), 1.60 KB, created by Nalin Dahyabhai on 2007-10-09 22:14:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nalin Dahyabhai

Created: 2007-10-09 22:14:48 UTC

Size: 1.60 KB

patch

obsolete

>Index: xinitrc-common
>===================================================================
>RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xinitrc-common,v
>retrieving revision 1.2
>diff -u -u -r1.2 xinitrc-common
>--- xinitrc-common	25 Sep 2006 17:30:37 -0000	1.2
>+++ xinitrc-common	9 Oct 2007 22:13:18 -0000
>@@ -71,3 +71,5 @@
> DBUS_LAUNCH=
> [ -x /usr/bin/dbus-launch -a -z "$DBUS_SESSION_BUS_ADDRESS" ] && DBUS_LAUNCH="/usr/bin/dbus-launch --exit-with-session"
> 
>+CK_XINIT_SESSION=
>+[ -x /usr/bin/ck-xinit-session ] && CK_XINIT_SESSION="/usr/bin/ck-xinit-session"
>Index: xinitrc
>===================================================================
>RCS file: /cvs/pkgs/rpms/xorg-x11-xinit/devel/xinitrc,v
>retrieving revision 1.3
>diff -u -u -r1.3 xinitrc
>--- xinitrc	25 Sep 2006 17:30:37 -0000	1.3
>+++ xinitrc	9 Oct 2007 22:13:18 -0000
>@@ -18,11 +18,11 @@
> # The user may have their own clients they want to run.  If they don't,
> # fall back to system defaults.
> if [ -f $HOME/.Xclients ]; then
>-    exec $SSH_AGENT $DBUS_LAUNCH $HOME/.Xclients || \
>-    exec $SSH_AGENT $HOME/.Xclients
>+    exec $CK_XINIT_SESSION $SSH_AGENT $DBUS_LAUNCH $HOME/.Xclients || \
>+    exec $CK_XINIT_SESSION $SSH_AGENT $HOME/.Xclients
> elif [ -f /etc/X11/xinit/Xclients ]; then
>-    exec $SSH_AGENT $DBUS_LAUNCH /etc/X11/xinit/Xclients || \
>-    exec $SSH_AGENT /etc/X11/xinit/Xclients
>+    exec $CK_XINIT_SESSION $SSH_AGENT $DBUS_LAUNCH /etc/X11/xinit/Xclients || \
>+    exec $CK_XINIT_SESSION $SSH_AGENT /etc/X11/xinit/Xclients
> else
>     # Failsafe settings.  Although we should never get here
>     # (we provide fallbacks in Xclients as well) it can't hurt.

Actions: View

Attachments on bug 287941: 200071 | 221981 | 221991