Attachment 148472 Details for Bug 217783 – proposed patch

[patch] proposed patch

xinitrc_ld_library_path_rhel5 (text/plain), 3.40 KB, created by ritz on 2007-02-21 11:17:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ritz

Created: 2007-02-21 11:17:16 UTC

Size: 3.40 KB

patch

obsolete

>diff -Naur /etc/X11/xinit/xinitrc-common X11.orig/xinit/xinitrc-common
>--- /etc/X11/xinit/xinitrc-common	2006-12-14 06:46:36.000000000 +0530
>+++ X11.orig/xinit/xinitrc-common	2007-02-21 22:27:51.000000000 +0530
>@@ -58,16 +58,6 @@
>     fi
> done
> 
>-# Prefix launch of session with ssh-agent if available and not already running.
>-SSH_AGENT=
>-if [ -x /usr/bin/ssh-agent -a -z "$SSH_AGENT_PID" ]; then
>-    if [ "x$TMPDIR" != "x" ]; then
>-        SSH_AGENT="/usr/bin/ssh-agent /bin/env TMPDIR=$TMPDIR"
>-    else
>-        SSH_AGENT="/usr/bin/ssh-agent"
>-  fi
>-fi
>-
> DBUS_LAUNCH=
> [ -x /usr/bin/dbus-launch -a -z "$DBUS_SESSION_BUS_ADDRESS" ] && DBUS_LAUNCH="/usr/bin/dbus-launch --exit-with-session"
> 
>diff -Naur /etc/X11/xinit/xinitrc-ssh X11.orig/xinit/xinitrc-ssh
>--- /etc/X11/xinit/xinitrc-ssh	2007-02-21 22:28:26.000000000 +0530
>+++ X11.orig/xinit/xinitrc-ssh	2007-02-21 22:27:51.000000000 +0530
>@@ -0,0 +1,22 @@
>+#!/bin/bash
>+
>+# A script so that
>+#    1) we read the standard system env vars
>+#    2) syadmins/integrators can add their own private options etc...
>+
>+ENV=
>+if [ $USER != "root" -a  "$LD_LIBRARY_PATH" != "" ]; then
>+       ENV="/bin/env LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
>+       echo $ENV>/tmp/rnv
>+fi
>+
>+SSH_AGENT=
>+if [ -x /usr/bin/ssh-agent -a -z "$SSH_AGENT_PID" ]; then
>+   if [ "$TMPDIR" != "" ]; then
>+       SSH_AGENT="/usr/bin/ssh-agent /bin/env TMPDIR=$TMPDIR"
>+   else
>+       SSH_AGENT="/usr/bin/ssh-agent"
>+ fi
>+fi
>+
>+exec -l $SHELL -c "$SSH_AGENT $ENV  $* "
>diff -Naur /etc/X11/xinit/Xsession X11.orig/xinit/Xsession
>--- /etc/X11/xinit/Xsession	2006-12-14 06:46:36.000000000 +0530
>+++ X11.orig/xinit/Xsession	2007-02-21 22:27:51.000000000 +0530
>@@ -59,21 +59,21 @@
>        exec -l $SHELL -c "xterm -geometry 80x24-0-0"
>        ;;
>     gnome)
>-       exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH gnome-session"
>+       exec -l $SHELL -c "/etc/X11/xinit/xinitrc-ssh $DBUS_LAUNCH gnome-session"
>        ;;
>     kde|kde1|kde2)
>-       exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $SWITCHDESKPATH/Xclients.kde"
>+       exec -l $SHELL -c "/etc/X11/xinit/xinitrc-ssh $DBUS_LAUNCH $SWITCHDESKPATH/Xclients.kde"
>        ;;
>     twm)
>         # fall back to twm
>-       exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $SWITCHDESKPATH/Xclients.twm"
>+       exec -l $SHELL -c "/etc/X11/xinit/xinitrc-ssh $DBUS_LAUNCH $SWITCHDESKPATH/Xclients.twm"
>        ;;
>     *)
>        # GDM provies either a command line as the first argument or
>        # provides 'failsafe', 'default' or 'custom'.  KDM will do the
>        # same at some point
>        if [ "$1" != "default" -a "$1" != "custom" ]; then
>-           exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $1"
>+           exec -l $SHELL -c "/etc/X11/xinit/xinitrc-ssh $DBUS_LAUNCH $1"
>        fi
>        ;;
>     esac
>@@ -82,11 +82,11 @@
> 
> # otherwise, take default action
> if [ -x "$HOME/.xsession" ]; then
>-    exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $HOME/.xsession"
>+    exec -l $SHELL -c "/etc/X11/xinit/xinitrc-ssh $DBUS_LAUNCH $HOME/.xsession"
> elif [ -x "$HOME/.Xclients" ]; then
>-    exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $HOME/.Xclients"
>+    exec -l $SHELL -c "/etc/X11/xinit/xinitrc-ssh $DBUS_LAUNCH $HOME/.Xclients"
> elif [ -x /etc/X11/xinit/Xclients ]; then
>-    exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH /etc/X11/xinit/Xclients"
>+    exec -l $SHELL -c "/etc/X11/xinit/xinitrc-ssh $DBUS_LAUNCH /etc/X11/xinit/Xclients"
> else
>     # should never get here; failsafe fallback
>     exec -l $SHELL -c "xsm"

Actions: View | Diff

Attachments on bug 217783: 148472