rpms/gdm/devel gdm-2.8.0.4-call-dbus-launch.patch,NONE,1.1
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Nov 14 19:07:14 UTC 2005
- Previous message (by thread): rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.112, 1.113 policycoreutils.spec, 1.175, 1.176
- Next message (by thread): rpms/kernel/devel linux-2.6-acpi-ignore-result.patch, NONE, 1.1 kernel-2.6.spec, 1.1666, 1.1667 linux-2.6-acpi-enable-ecburst.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rstrode
Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11907
Added Files:
gdm-2.8.0.4-call-dbus-launch.patch
Log Message:
add patch file
gdm-2.8.0.4-call-dbus-launch.patch:
Xsession.in | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
--- NEW FILE gdm-2.8.0.4-call-dbus-launch.patch ---
--- gdm-2.8.0.4/config/Xsession.in.call-dbus-launch 2005-11-14 13:48:06.000000000 -0500
+++ gdm-2.8.0.4/config/Xsession.in 2005-11-14 13:56:38.000000000 -0500
@@ -227,14 +227,30 @@
# add ssh-agent if found
sshagent="`gdmwhich ssh-agent`"
if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
- command="$sshagent -- $command"
-elif [ -z "$sshagent" ] ; then
- echo "$0: ssh-agent not found!"
+ if [ "x$TMPDIR" != "x" ]; then
+ sshagent="$sshagent /bin/env TMPDIR=$TMPDIR"
+ fi
+else
+ if [ -z "$sshagent" ] ; then
+ echo "$0: ssh-agent not found!"
+ fi
+ sshagent=""
+fi
+
+# add dbus-launch if found
+dbuslaunch="`gdmwhich dbus-launch`"
+if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+ dbuslaunch="/usr/bin/dbus-launch --exit-with-session"
+else
+ if [ -z "$dbuslaunch" ] ; then
+ echo "$0: dbuslaunch not found!"
+ fi
+ dbuslaunch=""
fi
echo "$0: Setup done, will execute: $command"
-eval exec $command
+eval exec $sshagent $dbuslaunch $command
echo "$0: Executing $command failed, will run xterm"
- Previous message (by thread): rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.112, 1.113 policycoreutils.spec, 1.175, 1.176
- Next message (by thread): rpms/kernel/devel linux-2.6-acpi-ignore-result.patch, NONE, 1.1 kernel-2.6.spec, 1.1666, 1.1667 linux-2.6-acpi-enable-ecburst.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list