diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2015-01-12 19:49:26 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2015-01-12 19:49:26 +0000 |
| commit | 857db4b3847861216e312bc93cb0fd2d4792d1c4 (patch) | |
| tree | 36e106c357840e7196afa605593279eb20a4e0db /x11-misc | |
| parent | Adds patch to bring layman-2.2.0 up to date for ssl-fetch, bug #536280 (diff) | |
| download | gentoo-2-857db4b3847861216e312bc93cb0fd2d4792d1c4.tar.gz gentoo-2-857db4b3847861216e312bc93cb0fd2d4792d1c4.tar.bz2 gentoo-2-857db4b3847861216e312bc93cb0fd2d4792d1c4.zip | |
Pass Xsession arguments to xinitrc.d/80-dbus. Bug #533456. Thanks to Joakim Tjernlund <Joakim.Tjernlund@transmode.se> for the patch
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 09BF4F54C2BA7F3C!)
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/lightdm/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/lightdm/files/Xsession | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog index 261f7ce5f1b0..f3a019bf14a2 100644 --- a/x11-misc/lightdm/ChangeLog +++ b/x11-misc/lightdm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/lightdm # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.103 2015/01/11 11:54:54 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.104 2015/01/12 19:49:26 hwoarang Exp $ + + 12 Jan 2015; Markos Chandras <hwoarang@gentoo.org> files/Xsession: + Pass Xsession arguments to xinitrc.d/80-dbus. Bug #533456. Thanks to Joakim + Tjernlund <Joakim.Tjernlund@transmode.se> for the patch 11 Jan 2015; Markos Chandras <hwoarang@gentoo.org> lightdm-1.13.0.ebuild: Amend fix from bug #524792 to lightdm-greeter as well diff --git a/x11-misc/lightdm/files/Xsession b/x11-misc/lightdm/files/Xsession index 5da041e6d7ec..2169aefc0af3 100644 --- a/x11-misc/lightdm/files/Xsession +++ b/x11-misc/lightdm/files/Xsession @@ -27,7 +27,7 @@ for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do 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 @@ fi 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 @@ fi echo "X session wrapper complete, running session $@" -exec $@ +exec "$command" |