summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2010-11-03 14:11:47 +0100
committerTomas Chvatal <scarabeus@gentoo.org>2010-11-03 14:11:47 +0100
commit2a4580fbd8a1602072ed6e11fe25dd09e783b614 (patch)
treea72f6aa1f63a5764bbdc3533676f6c83bc7dedc1
parent[x11-proto/xproto] Sync with main tree. (diff)
downloadx11-2a4580fbd8a1602072ed6e11fe25dd09e783b614.tar.gz
x11-2a4580fbd8a1602072ed6e11fe25dd09e783b614.tar.bz2
x11-2a4580fbd8a1602072ed6e11fe25dd09e783b614.zip
[x11-apps/xinit] Sync xinitrc with main tree.
-rw-r--r--x11-apps/xinit/Manifest2
-rwxr-xr-xx11-apps/xinit/files/xserverrc3
2 files changed, 3 insertions, 2 deletions
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 030a0c60..e274b78d 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -3,6 +3,6 @@ AUX 0001-Gentoo-customizations.patch 1508 RMD160 8af271ddcaf20e588baaf6e8477e435
AUX Xsession 2187 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 SHA1 8ba8de5114871f8500f428a03f87a42714d0ce14 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3
AUX chooser.sh 1301 RMD160 47ae0768ed54f235443399bdf08632c9f5cd3d10 SHA1 c378244ce59d74c966d564b3b34ac8168e3d0352 SHA256 5808080351f80c56b5ab78946103551a628925a0a3a95417b28002bf6e088212
AUX startDM.sh 858 RMD160 d7ef866ddd09e3d4117b3363aaa6382a9b8cd153 SHA1 1b826dfb4d5a184d6d7cc1995d685b55c9c188ac SHA256 a7aca1e37e5b8fecb49aa96c4e2850547a47e154edabcdbd1cfcb8ab49337549
-AUX xserverrc 30 RMD160 7575b72f2f5ec4afba3e3700c213a7fbe40a0f8d SHA1 febf89ebfcc056c16bf70a4e651f4074af71b224 SHA256 18c040add4d137aaa58f76b134088acb1269dd291a14bcc283765c6c897d49fe
+AUX xserverrc 45 RMD160 ba59828df58de185ac8cbe762f746cc4b5b25594 SHA1 297121e4f3bc8abbaade83cd2583d16e8887e15b SHA256 86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387
EBUILD xinit-9999.ebuild 1689 RMD160 0f5775962c637dbbc377a1ce4b4eaf7906450fd1 SHA1 90958f7267430a153e480e058fffbba7b6f9c652 SHA256 e03d556fadbd43c77476cecce04c97631565873f0963a626aa0214c0db27dc3e
MISC metadata.xml 323 RMD160 269a698f418e2fb289704dcf9dd8ee2291c5b266 SHA1 5dc07448925c52d5cc1e2c7cd1d5d9fb4537d04a SHA256 cc0d02e6168e77461049b0a9a0493e11d5ff21b19de24ac2436c536b74055444
diff --git a/x11-apps/xinit/files/xserverrc b/x11-apps/xinit/files/xserverrc
index 6a636c11..b4de2528 100755
--- a/x11-apps/xinit/files/xserverrc
+++ b/x11-apps/xinit/files/xserverrc
@@ -1 +1,2 @@
-exec /usr/bin/X -nolisten tcp
+#!/bin/sh
+exec /usr/bin/X -nolisten tcp "$@"