From: Austin English <wizardedit@gentoo.org>
Date: Wed, 18 Oct 2017 21:41:12 +0000 (-0500)
Subject: x11-apps/xinit: use /lib/gentoo/functions.sh instead of deprecated /etc/init.d/functi... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2bb6b9e50bdb;p=gentoo.git

x11-apps/xinit: use /lib/gentoo/functions.sh instead of deprecated /etc/init.d/functions.sh

Also bail out early if the machine is not running OpenRC, with an
appropriate error

Acked-By: Manuel Rüger <mrueg@gentoo.org>

Gentoo-Bug: https://bugs.gentoo.org/504140
Package-Manager: Portage-2.3.6, Repoman-2.3.2
---

diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
index 66cceb3a68f5..21fb452df1e3 100644
--- a/x11-apps/xinit/files/startDM.sh
+++ b/x11-apps/xinit/files/startDM.sh
@@ -1,12 +1,17 @@
 #!/bin/sh
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
 
 # We need to source /etc/profile for stuff like $LANG to work
 # bug #10190.
 . /etc/profile
 
-. /etc/init.d/functions.sh
+. /lib/gentoo/functions.sh
+
+# Bail out early if on a non-OpenRC system:
+if [ ! -d /run/openrc ]; then
+    eerror "$0 should only be used on OpenRC systems"
+fi
 
 # baselayout-1 compat
 if ! type get_options >/dev/null 2>/dev/null ; then