| 1 |
commit: b46e0cd479d9880aeab4b2580d70d129de835a4a |
| 2 |
Author: Tomas Chvatal <tchvatal <AT> suse <DOT> cz> |
| 3 |
AuthorDate: Sun Apr 29 13:03:43 2012 +0000 |
| 4 |
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 29 13:03:43 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=b46e0cd4 |
| 7 |
|
| 8 |
Version bump the init script wrt bug#410229. |
| 9 |
|
| 10 |
--- |
| 11 |
.../xorg-server/files/{xdm.initd-7 => xdm.initd-8} | 8 ++------ |
| 12 |
x11-base/xorg-server/xorg-server-9999.ebuild | 2 +- |
| 13 |
2 files changed, 3 insertions(+), 7 deletions(-) |
| 14 |
|
| 15 |
diff --git a/x11-base/xorg-server/files/xdm.initd-7 b/x11-base/xorg-server/files/xdm.initd-8 |
| 16 |
similarity index 97% |
| 17 |
rename from x11-base/xorg-server/files/xdm.initd-7 |
| 18 |
rename to x11-base/xorg-server/files/xdm.initd-8 |
| 19 |
index 51fc700..063f88b 100644 |
| 20 |
--- a/x11-base/xorg-server/files/xdm.initd-7 |
| 21 |
+++ b/x11-base/xorg-server/files/xdm.initd-8 |
| 22 |
@@ -68,11 +68,7 @@ setup_dm() { |
| 23 |
NAME= |
| 24 |
case "${MY_XDM}" in |
| 25 |
kdm|kde) |
| 26 |
- EXE="$(which kdm)" |
| 27 |
- PIDFILE=/var/run/kdm.pid |
| 28 |
- ;; |
| 29 |
- kdm-*) |
| 30 |
- EXE="/usr/kde/${MY_XDM#kdm-}/bin/kdm" |
| 31 |
+ EXE=/usr/bin/kdm |
| 32 |
PIDFILE=/var/run/kdm.pid |
| 33 |
;; |
| 34 |
entrance*) |
| 35 |
@@ -104,7 +100,7 @@ setup_dm() { |
| 36 |
;; |
| 37 |
*) |
| 38 |
# first find out if there is such executable |
| 39 |
- EXE="$(which ${MY_XDM} 2>/dev/null)" |
| 40 |
+ EXE="$(command -v ${MY_XDM} 2>/dev/null)" |
| 41 |
PIDFILE="/var/run/${MY_XDM}.pid" |
| 42 |
|
| 43 |
# warn user that he is doing sick things if the exe was not found |
| 44 |
|
| 45 |
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild |
| 46 |
index 3334c09..c89b1ac 100644 |
| 47 |
--- a/x11-base/xorg-server/xorg-server-9999.ebuild |
| 48 |
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild |
| 49 |
@@ -185,7 +185,7 @@ src_install() { |
| 50 |
fi |
| 51 |
|
| 52 |
newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
| 53 |
- newinitd "${FILESDIR}"/xdm.initd-7 xdm |
| 54 |
+ newinitd "${FILESDIR}"/xdm.initd-8 xdm |
| 55 |
newconfd "${FILESDIR}"/xdm.confd-4 xdm |
| 56 |
|
| 57 |
# install the @x11-module-rebuild set for Portage |
Archives