From e4419617d4ef332841c41cd68112be8b0bbab6bb Mon Sep 17 00:00:00 2001 From: Austin English Date: Wed, 18 Oct 2017 16:41:12 -0500 Subject: [PATCH] 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 Gentoo-Bug: https://bugs.gentoo.org/504140 Package-Manager: Portage-2.3.6, Repoman-2.3.2 Signed-off-by: Austin English --- x11-apps/xinit/files/startDM.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh index 66cceb3a68f..21fb452df1e 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 -- 2.13.5