Gentoo Archives: gentoo-commits

From: Chi-Thanh Christopher Nguyen <chithanh@××××××××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/x11:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
Date: Sun, 26 Jan 2014 17:42:02
Message-Id: 1390758117.486ed0687972a50fc683182309630de5e35a0919.chithead@gentoo
1 commit: 486ed0687972a50fc683182309630de5e35a0919
2 Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 26 17:41:57 2014 +0000
4 Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
5 CommitDate: Sun Jan 26 17:41:57 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=486ed068
7
8 x11-base/xorg-server: add sddm support to xdm init script, bug #498972.
9
10 ---
11 x11-base/xorg-server/files/{xdm.initd-10 => xdm.initd-11} | 4 ++++
12 x11-base/xorg-server/xorg-server-9999.ebuild | 2 +-
13 2 files changed, 5 insertions(+), 1 deletion(-)
14
15 diff --git a/x11-base/xorg-server/files/xdm.initd-10 b/x11-base/xorg-server/files/xdm.initd-11
16 similarity index 98%
17 rename from x11-base/xorg-server/files/xdm.initd-10
18 rename to x11-base/xorg-server/files/xdm.initd-11
19 index 9826e6b..864726f 100644
20 --- a/x11-base/xorg-server/files/xdm.initd-10
21 +++ b/x11-base/xorg-server/files/xdm.initd-11
22 @@ -106,6 +106,10 @@ setup_dm() {
23 PIDFILE=/run/lightdm.pid
24 START_STOP_ARGS="--background"
25 ;;
26 + sddm)
27 + EXE=/usr/bin/sddm
28 + START_STOP_ARGS="--background"
29 + ;;
30 *)
31 # first find out if there is such executable
32 EXE="$(command -v ${MY_XDM} 2>/dev/null)"
33
34 diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
35 index 0367b18..dbca4be 100644
36 --- a/x11-base/xorg-server/xorg-server-9999.ebuild
37 +++ b/x11-base/xorg-server/xorg-server-9999.ebuild
38 @@ -191,7 +191,7 @@ src_install() {
39 fi
40
41 newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
42 - newinitd "${FILESDIR}"/xdm.initd-10 xdm
43 + newinitd "${FILESDIR}"/xdm.initd-11 xdm
44 newconfd "${FILESDIR}"/xdm.confd-4 xdm
45
46 # install the @x11-module-rebuild set for Portage