Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/files/
Date: Thu, 19 Oct 2017 16:08:47
Message-Id: 1508429131.dd42e7509a42d4bd8f139a7910eb519d939924f4.mattst88@gentoo
1 commit: dd42e7509a42d4bd8f139a7910eb519d939924f4
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 19 16:05:31 2017 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 19 16:05:31 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd42e750
7
8 Revert "x11-apps/xinit: use /lib/gentoo/functions.sh instead of deprecated /etc/init.d/functions.sh"
9
10 This reverts commit 2bb6b9e50bdb8efc9a4627e60a4e63d38e8d6255.
11
12 Gentoo-Bug: https://bugs.gentoo.org/634706
13
14 x11-apps/xinit/files/startDM.sh | 9 ++-------
15 1 file changed, 2 insertions(+), 7 deletions(-)
16
17 diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
18 index 21fb452df1e..66cceb3a68f 100644
19 --- a/x11-apps/xinit/files/startDM.sh
20 +++ b/x11-apps/xinit/files/startDM.sh
21 @@ -1,17 +1,12 @@
22 #!/bin/sh
23 -# Copyright 1999-2017 Gentoo Foundation
24 +# Copyright 1999-2011 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License, v2
26
27 # We need to source /etc/profile for stuff like $LANG to work
28 # bug #10190.
29 . /etc/profile
30
31 -. /lib/gentoo/functions.sh
32 -
33 -# Bail out early if on a non-OpenRC system:
34 -if [ ! -d /run/openrc ]; then
35 - eerror "$0 should only be used on OpenRC systems"
36 -fi
37 +. /etc/init.d/functions.sh
38
39 # baselayout-1 compat
40 if ! type get_options >/dev/null 2>/dev/null ; then