xorg: Changes to 'debian-unstable'
debian/changelog | 3 ++-
debian/local/Xsession.5 | 14 +++++++++++---
2 files changed, 13 insertions(+), 4 deletions(-)
New commits:
commit 658ec1688ce0c3500eaea99f626cac724e01450e
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Tue May 15 09:06:37 2007 +0200
Minor fixes in Xsession(5).
diff --git a/debian/changelog b/debian/changelog
index e70e4a0..78de2e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,12 +14,13 @@ xorg (1:7.2-4) UNRELEASED; urgency=low
Xsession.options(5) manpages. Thanks Reuben Thomas (closes: #365430).
* Add documentation for use-session-dbus in Xsession.options(5), based on
75dbus_dbus-launch header in the dbus package, closes: #322284.
+ * Minor fixes in Xsession(5), thanks Lajos Parkatti, closes: #372519.
[ Timo Aaltonen ]
* Xsession.d/*: change 'which' -> '/usr/bin/which', since the zsh builtin
command can in some circumstances make the login fail.
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Tue, 15 May 2007 01:24:23 +0200
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Tue, 15 May 2007 09:06:05 +0200
xorg (1:7.2-3) unstable; urgency=low
diff --git a/debian/local/Xsession.5 b/debian/local/Xsession.5
index 6ebc225..d7b3e27 100644
--- a/debian/local/Xsession.5
+++ b/debian/local/Xsession.5
@@ -79,13 +79,18 @@ See \(lqCUSTOMIZING THE STARTUP PROCEDURE\(rq below.
.I Xsession
may optionally be passed a single argument indicating the type of X
session to be started.
-It is up to the display manager to set the argument, and there is no way to
-pass
+It is up to the display manager to set the argument. To pass
.I Xsession
an argument from
.B startx
or
-.BR xinit .
+.BR xinit ,
+.I /etc/X11/Xsession
+(or
+.IR /etc/X11/xinit/xinitrc )
+must be called explicitly with a path, as in
+.B startx /etc/X11/Xsession
+.BR failsafe .
By default, three different arguments are supported:
.TP
.B failsafe
@@ -120,6 +125,9 @@ in
.I .xsession
files, it makes little sense to permit them to specify the names of
arbitrary programs to run.)
+Note that the restriction may be easy to bypass, e.g. by using a
+.I .gnomerc
+file instead.
.SS "DEFAULT STARTUP PROCEDURE"
Initially,
.I Xsession
Reply to: