hwoarang15/01/12 19:49:26
Modified: Xsession
Log:
Pass Xsession arguments to xinitrc.d/80-dbus. Bug #533456. Thanks to Joakim
Tjernlund joakim.tjernl...@transmode.se for the patch
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
09BF4F54C2BA7F3C!)
Revision ChangesPath
1.2 x11-misc/lightdm/files/Xsession
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/files/Xsession?rev=1.2view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/files/Xsession?rev=1.2content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/files/Xsession?r1=1.1r2=1.2
Index: Xsession
===
RCS file: /var/cvsroot/gentoo-x86/x11-misc/lightdm/files/Xsession,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Xsession5 Nov 2011 01:44:14 - 1.1
+++ Xsession12 Jan 2015 19:49:26 - 1.2
@@ -27,7 +27,7 @@
setxkbmap `cat $file`
XKB_IN_USE=yes
fi
-done
+done
# Load xmodmap if not using XKB
if [ -z $XKB_IN_USE ]; then
@@ -41,6 +41,11 @@
unset XKB_IN_USE
+# /etc/X11/xinit/xinitrc.d/80-dbus expects $command to be
+# set to the Xsession arguments. So make it happy. See
+# https://bugs.gentoo.org/show_bug.cgi?id=533456
+command=$@
+
# Run all system xinitrc shell scripts.
xinitdir=/etc/X11/xinit/xinitrc.d
if [ -d $xinitdir ]; then
@@ -66,4 +71,4 @@
echo X session wrapper complete, running session $@
-exec $@
+exec $command