commit: 7bfc8e3f218e86ee62242d5e0802596cf8efc36c Author: Anna (navi) Figueiredo Gomes <navi <AT> vlhl <DOT> dev> AuthorDate: Mon Mar 3 18:29:29 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Mar 3 18:37:05 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bfc8e3f
gui-libs/display-manager-init: Load functions.sh from libexec. Closes: https://bugs.gentoo.org/950508 Signed-off-by: Anna (navi) Figueiredo Gomes <navi <AT> vlhl.dev> Closes: https://github.com/gentoo/gentoo/pull/40875 Signed-off-by: Sam James <sam <AT> gentoo.org> ...init-1.1.2.ebuild => display-manager-init-1.1.2-r1.ebuild} | 2 +- gui-libs/display-manager-init/files/startDM-r1 | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gui-libs/display-manager-init/display-manager-init-1.1.2.ebuild b/gui-libs/display-manager-init/display-manager-init-1.1.2-r1.ebuild similarity index 97% rename from gui-libs/display-manager-init/display-manager-init-1.1.2.ebuild rename to gui-libs/display-manager-init/display-manager-init-1.1.2-r1.ebuild index 66a3bbc644a6..a8352e66cf49 100644 --- a/gui-libs/display-manager-init/display-manager-init-1.1.2.ebuild +++ b/gui-libs/display-manager-init/display-manager-init-1.1.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/gui-libs/display-manager-init/files/startDM-r1 b/gui-libs/display-manager-init/files/startDM-r1 index b23344bbdcc7..11309bb45f29 100644 --- a/gui-libs/display-manager-init/files/startDM-r1 +++ b/gui-libs/display-manager-init/files/startDM-r1 @@ -12,9 +12,18 @@ # Bail out early if on a non-OpenRC system: if [ ! -d /run/openrc ]; then eerror "$0 should only be used on OpenRC systems" + exit 1 fi -. /lib/rc/sh/functions.sh +# rc_libexec moved in >=openrc-0.56 +if [ -e /lib/rc/sh/functions.sh ]; then + . /lib/rc/sh/functions.sh +elif [ -e /usr/libexec/rc/sh/functions.sh ]; then + . /usr/libexec/rc/sh/functions.sh +else + eerror "Unable to find rc/sh/functions.sh" + exit 1 +fi export RC_SVCNAME=display-manager EXEC="$(get_options service)"
