From: "Piotr Karbowski" <slashbeast@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: gui-libs/display-manager-init/files/, gui-libs/display-manager-init/
Date: Fri, 26 Feb 2021 19:24:39 +0000 (UTC) [thread overview]
Message-ID: <1614367434.da4634e4944e2aace9f850a298cd64e351b6dcfb.slashbeast@gentoo> (raw)
commit: da4634e4944e2aace9f850a298cd64e351b6dcfb
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Fri Feb 26 19:10:28 2021 +0000
Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Fri Feb 26 19:23:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da4634e4
gui-libs/display-manager-init: fix quotes
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>
.../display-manager-init-1.0-r3.ebuild | 54 ++++++++++++++++++++++
gui-libs/display-manager-init/files/startDM-r1 | 29 ++++++++++++
2 files changed, 83 insertions(+)
diff --git a/gui-libs/display-manager-init/display-manager-init-1.0-r3.ebuild b/gui-libs/display-manager-init/display-manager-init-1.0-r3.ebuild
new file mode 100644
index 00000000000..1a18f3f2feb
--- /dev/null
+++ b/gui-libs/display-manager-init/display-manager-init-1.0-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="RC init files for starting display and login managers"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:X11"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+
+S="${WORKDIR}"
+
+RDEPEND="
+ sys-apps/gentoo-functions
+ !<=sys-apps/sysvinit-2.98
+ !<=x11-apps/xinit-1.4.1
+ !<=x11-base/xorg-server-1.20.10
+ !=x11-base/xorg-server-1.20.10-r2
+"
+
+src_install() {
+ newinitd "${FILESDIR}"/display-manager-setup.initd display-manager-setup
+ newinitd "${FILESDIR}"/display-manager.initd-r1 display-manager
+ newinitd "${FILESDIR}"/xdm.initd xdm
+ newconfd "${FILESDIR}"/display-manager.confd display-manager
+ newbin "${FILESDIR}"/startDM-r1 startDM
+ # backwards compatibility
+ dosym "${ESYSROOT}"/usr/bin/startDM /etc/X11/startDM.sh
+}
+
+pkg_preinst() {
+ if [[ ${REPLACING_VERSIONS} == "" && -f "${EROOT}"/etc/conf.d/xdm && ! -f "${EROOT}"/etc/conf.d/display-manager ]]; then
+ cp -a "${EROOT}"/etc/conf.d/{xdm,display-manager} || die
+ fi
+ local rlevel using_xdm
+ using_xdm=no
+ for rlevel in boot default sysinit; do
+ if [[ -e "${EROOT}"/etc/runlevels/${rlevel}/xdm ]]; then
+ using_xdm=yes
+ fi
+ done
+ if [[ "${using_xdm}" = "yes" ]]; then
+ ewarn "The 'xdm' service has been replaced by new 'display-manager'"
+ ewarn "service, please switch now:"
+ ewarn
+ ewarn " # rc-update del xdm default"
+ ewarn " # rc-update add display-manager default"
+ ewarn
+ ewarn "Remember to run etc-update or dispatch-conf to update the"
+ ewarn "config protected service files."
+ fi
+}
diff --git a/gui-libs/display-manager-init/files/startDM-r1 b/gui-libs/display-manager-init/files/startDM-r1
new file mode 100644
index 00000000000..b23344bbdcc
--- /dev/null
+++ b/gui-libs/display-manager-init/files/startDM-r1
@@ -0,0 +1,29 @@
+#!/bin/sh
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2
+
+# We need to source /etc/profile.env for stuff like $LANG to work
+# bug #10190.
+. /etc/profile.env
+
+# need eerror
+. /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
+
+. /lib/rc/sh/functions.sh
+
+export RC_SVCNAME=display-manager
+EXEC="$(get_options service)"
+NAME="$(get_options name)"
+PIDFILE="$(get_options pidfile)"
+START_STOP_ARGS="$(get_options start_stop_args)"
+
+start-stop-daemon --start --exec "${EXEC}" \
+${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} ${START_STOP_ARGS} || \
+eerror "ERROR: could not start the Display Manager"
+
+# vim:ts=4
next reply other threads:[~2021-02-26 19:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-26 19:24 Piotr Karbowski [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-10-09 22:10 [gentoo-commits] repo/gentoo:master commit in: gui-libs/display-manager-init/files/, gui-libs/display-manager-init/ Piotr Karbowski
2021-02-26 19:24 Piotr Karbowski
2021-01-30 19:21 Piotr Karbowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1614367434.da4634e4944e2aace9f850a298cd64e351b6dcfb.slashbeast@gentoo \
--to=slashbeast@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox