| 1 |
scarabeus 10/11/01 15:51:31 |
| 2 |
|
| 3 |
Added: 0001-Gentoo-customizations.patch |
| 4 |
Log: |
| 5 |
Version bump |
| 6 |
|
| 7 |
(Portage version: 2.2_rc98/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-apps/xinit/files/0001-Gentoo-customizations.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/files/0001-Gentoo-customizations.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/files/0001-Gentoo-customizations.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 0001-Gentoo-customizations.patch |
| 16 |
=================================================================== |
| 17 |
From d24cea5021fab8a11b1492a031319939d133d221 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Tomas Chvatal <scarabeus@g.o> |
| 19 |
Date: Mon, 1 Nov 2010 16:46:36 +0100 |
| 20 |
Subject: [PATCH] Gentoo customizations. |
| 21 |
|
| 22 |
|
| 23 |
Signed-off-by: Tomas Chvatal <scarabeus@g.o> |
| 24 |
--- |
| 25 |
xinitrc.cpp | 26 ++++++++++++++++++-------- |
| 26 |
1 files changed, 18 insertions(+), 8 deletions(-) |
| 27 |
|
| 28 |
diff --git a/xinitrc.cpp b/xinitrc.cpp |
| 29 |
index 049a8e4..80c3ad9 100644 |
| 30 |
--- a/xinitrc.cpp |
| 31 |
+++ b/xinitrc.cpp |
| 32 |
@@ -2,8 +2,8 @@ XCOMM!SHELL_CMD |
| 33 |
|
| 34 |
userresources=$HOME/.Xresources |
| 35 |
usermodmap=$HOME/.Xmodmap |
| 36 |
-sysresources=XINITDIR/.Xresources |
| 37 |
-sysmodmap=XINITDIR/.Xmodmap |
| 38 |
+sysresources=XINITDIR/Xresources |
| 39 |
+sysmodmap=XINITDIR/Xmodmap |
| 40 |
|
| 41 |
XCOMM merge in defaults and keymaps |
| 42 |
|
| 43 |
@@ -84,15 +84,25 @@ fi |
| 44 |
XCOMM This is the fallback case if nothing else is executed above |
| 45 |
#endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */ |
| 46 |
|
| 47 |
+if [ -n "`/etc/X11/chooser.sh`" ]; then |
| 48 |
+ command="`/etc/X11/chooser.sh`" |
| 49 |
+else |
| 50 |
+ failsafe="yes" |
| 51 |
+fi |
| 52 |
+ |
| 53 |
if [ -d XINITDIR/xinitrc.d ] ; then |
| 54 |
- for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do |
| 55 |
+ for f in XINITDIR/xinitrc.dXSLASHGLOB ; do |
| 56 |
[ -x "$f" ] && . "$f" |
| 57 |
done |
| 58 |
unset f |
| 59 |
fi |
| 60 |
|
| 61 |
-TWM & |
| 62 |
-XCLOCK -geometry 50x50-1+1 & |
| 63 |
-XTERM -geometry 80x50+494+51 & |
| 64 |
-XTERM -geometry 80x20+494-0 & |
| 65 |
-exec XTERM -geometry 80x66+0+0 -name login |
| 66 |
+if [ -n "$failsafe" ]; then |
| 67 |
+ TWM & |
| 68 |
+ XCLOCK -geometry 50x50-1+1 & |
| 69 |
+ XTERM -geometry 80x50+494+51 & |
| 70 |
+ XTERM -geometry 80x20+494-0 & |
| 71 |
+ exec XTERM -geometry 80x66+0+0 -name login |
| 72 |
+else |
| 73 |
+ exec $command |
| 74 |
+fi |
| 75 |
-- |
| 76 |
1.7.3.1 |
Archives