| 1 |
commit: 2bb6b9e50bdb8efc9a4627e60a4e63d38e8d6255 |
| 2 |
Author: Austin English <wizardedit <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 18 21:41:12 2017 +0000 |
| 4 |
Commit: Austin English <wizardedit <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 18 21:47:52 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bb6b9e5 |
| 7 |
|
| 8 |
x11-apps/xinit: use /lib/gentoo/functions.sh instead of deprecated /etc/init.d/functions.sh |
| 9 |
|
| 10 |
Also bail out early if the machine is not running OpenRC, with an |
| 11 |
appropriate error |
| 12 |
|
| 13 |
Acked-By: Manuel Rüger <mrueg <AT> gentoo.org> |
| 14 |
|
| 15 |
Gentoo-Bug: https://bugs.gentoo.org/504140 |
| 16 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 17 |
|
| 18 |
x11-apps/xinit/files/startDM.sh | 9 +++++++-- |
| 19 |
1 file changed, 7 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh |
| 22 |
index 66cceb3a68f..21fb452df1e 100644 |
| 23 |
--- a/x11-apps/xinit/files/startDM.sh |
| 24 |
+++ b/x11-apps/xinit/files/startDM.sh |
| 25 |
@@ -1,12 +1,17 @@ |
| 26 |
#!/bin/sh |
| 27 |
-# Copyright 1999-2011 Gentoo Foundation |
| 28 |
+# Copyright 1999-2017 Gentoo Foundation |
| 29 |
# Distributed under the terms of the GNU General Public License, v2 |
| 30 |
|
| 31 |
# We need to source /etc/profile for stuff like $LANG to work |
| 32 |
# bug #10190. |
| 33 |
. /etc/profile |
| 34 |
|
| 35 |
-. /etc/init.d/functions.sh |
| 36 |
+. /lib/gentoo/functions.sh |
| 37 |
+ |
| 38 |
+# Bail out early if on a non-OpenRC system: |
| 39 |
+if [ ! -d /run/openrc ]; then |
| 40 |
+ eerror "$0 should only be used on OpenRC systems" |
| 41 |
+fi |
| 42 |
|
| 43 |
# baselayout-1 compat |
| 44 |
if ! type get_options >/dev/null 2>/dev/null ; then |
Archives