From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QuVA5-0003JK-0O for garchives@archives.gentoo.org; Fri, 19 Aug 2011 19:55:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 144C621C1B5; Fri, 19 Aug 2011 19:55:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D8EF021C1B7 for ; Fri, 19 Aug 2011 19:55:12 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 110261B403A for ; Fri, 19 Aug 2011 19:55:12 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2214) id C6C2120051; Fri, 19 Aug 2011 19:55:10 +0000 (UTC) From: "Jeremy Olexa (darkside)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, darkside@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in x11-misc/slim/files: Xsession-r2 X-VCS-Repository: gentoo-x86 X-VCS-Files: Xsession-r2 X-VCS-Directories: x11-misc/slim/files X-VCS-Committer: darkside X-VCS-Committer-Name: Jeremy Olexa Content-Type: text/plain; charset=utf8 Message-Id: <20110819195510.C6C2120051@flycatcher.gentoo.org> Date: Fri, 19 Aug 2011 19:55:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 0d21ec3b5233393343afb8a3dab663dc darkside 11/08/19 19:55:10 Modified: Xsession-r2 Log: revbump for consolekit fixes by Ian Stakenvicius =20 (Portage version: 2.1.10.3/cvs/Linux i686) Revision Changes Path 1.2 x11-misc/slim/files/Xsession-r2 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/file= s/Xsession-r2?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/file= s/Xsession-r2?rev=3D1.2&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/file= s/Xsession-r2?r1=3D1.1&r2=3D1.2 Index: Xsession-r2 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/x11-misc/slim/files/Xsession-r2,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Xsession-r2 16 Aug 2011 02:18:37 -0000 1.1 +++ Xsession-r2 19 Aug 2011 19:55:10 -0000 1.2 @@ -142,6 +142,9 @@ exec xterm -geometry 80x24+0+0 fi =20 +# temporarily unset XDG_SESSION_COOKIE so consolekit launches a new sess= ion +realxdgcookie=3D"$XDG_SESSION_COOKIE" +XDG_SESSION_COOKIE=3D # run all system xinitrc shell scripts which will update command if [ -d /etc/X11/xinit/xinitrc.d ]; then for i in /etc/X11/xinit/xinitrc.d/* ; do @@ -151,6 +154,9 @@ done unset i fi +# restore XDG_SESSION_COOKIE +XDG_SESSION_COOKIE=3D"$realxdgcookie" +unset realxdgcookie =20 echo "$0: Setup done, will execute: $command" exec $command