commit: 2bb6b9e50bdb8efc9a4627e60a4e63d38e8d6255 Author: Austin English <wizardedit <AT> gentoo <DOT> org> AuthorDate: Wed Oct 18 21:41:12 2017 +0000 Commit: Austin English <wizardedit <AT> gentoo <DOT> org> CommitDate: Wed Oct 18 21:47:52 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bb6b9e5
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 <AT> gentoo.org> Gentoo-Bug: https://bugs.gentoo.org/504140 Package-Manager: Portage-2.3.6, Repoman-2.3.2 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
