* [gentoo-commits] repo/gentoo:master commit in: gui-libs/display-manager-init/files/, gui-libs/display-manager-init/
@ 2021-01-30 19:21 Piotr Karbowski
0 siblings, 0 replies; 4+ messages in thread
From: Piotr Karbowski @ 2021-01-30 19:21 UTC (permalink / raw
To: gentoo-commits
commit: c78bee32adb057ac965b7f60f46980951cfa44bc
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Thu Sep 10 01:30:09 2020 +0000
Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 19:17:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c78bee32
gui-libs/display-manager-init: refactor init files out of xorg-server
Closes: https://bugs.gentoo.org/730644
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>
.../display-manager-init-1.0.ebuild | 37 ++++
.../files/display-manager-setup.initd | 13 ++
.../files/display-manager.confd | 13 ++
.../files/display-manager.initd | 234 +++++++++++++++++++++
gui-libs/display-manager-init/files/startDM | 29 +++
gui-libs/display-manager-init/files/xdm.initd | 13 ++
gui-libs/display-manager-init/metadata.xml | 8 +
7 files changed, 347 insertions(+)
diff --git a/gui-libs/display-manager-init/display-manager-init-1.0.ebuild b/gui-libs/display-manager-init/display-manager-init-1.0.ebuild
new file mode 100644
index 00000000000..576a0a7c887
--- /dev/null
+++ b/gui-libs/display-manager-init/display-manager-init-1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+S="${FILESDIR}"
+
+RDEPEND="
+ sys-apps/gentoo-functions
+ !<=sys-apps/sysvinit-2.98
+ !<=x11-apps/xinit-1.4.1
+ !<=x11-base/xorg-server-1.20.10
+"
+
+src_install() {
+ newinitd "${FILESDIR}"/display-manager-setup.initd display-manager-setup
+ newinitd "${FILESDIR}"/display-manager.initd display-manager
+ newinitd "${FILESDIR}"/xdm.initd xdm
+ newconfd "${FILESDIR}"/display-manager.confd display-manager
+ exeinto /usr/bin
+ doexe "${FILESDIR}"/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
+ mv "${EROOT}"/etc/conf.d/{xdm,display-manager} || die
+ fi
+}
diff --git a/gui-libs/display-manager-init/files/display-manager-setup.initd b/gui-libs/display-manager-init/files/display-manager-setup.initd
new file mode 100644
index 00000000000..05feeee84ae
--- /dev/null
+++ b/gui-libs/display-manager-init/files/display-manager-setup.initd
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need localmount
+}
+
+start() {
+ if get_bootparam "nogui" ; then
+ touch /run/.nogui
+ fi
+}
diff --git a/gui-libs/display-manager-init/files/display-manager.confd b/gui-libs/display-manager-init/files/display-manager.confd
new file mode 100644
index 00000000000..25d57e923c4
--- /dev/null
+++ b/gui-libs/display-manager-init/files/display-manager.confd
@@ -0,0 +1,13 @@
+# We always try and start the DM on a static VT. The various DMs normally
+# default to using VT7. If you wish to use the display-manager init
+# script, then you should ensure that the VT checked is the same VT your
+# DM wants to use.
+# We do this check to ensure that you haven't accidentally configured
+# something to run on the VT in your /etc/inittab file so that
+# you don't get a dead keyboard.
+CHECKVT=7
+
+# What display manager do you use ?
+# [ xdm | greetd | gdm | sddm | gpe | lightdm | entrance ]
+# NOTE: If this is set in /etc/rc.conf, that setting will override this one.
+DISPLAYMANAGER="xdm"
diff --git a/gui-libs/display-manager-init/files/display-manager.initd b/gui-libs/display-manager-init/files/display-manager.initd
new file mode 100644
index 00000000000..e650df9600e
--- /dev/null
+++ b/gui-libs/display-manager-init/files/display-manager.initd
@@ -0,0 +1,234 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2
+
+# This is here to serve as a note to myself, and future developers.
+#
+# Any Display manager (gdm,kdm,xdm) has the following problem: if
+# it is started before any getty, and no vt is specified, it will
+# usually run on vt2. When the getty on vt2 then starts, and the
+# DM is already started, the getty will take control of the keyboard,
+# leaving us with a "dead" keyboard.
+#
+# Resolution: add the following line to /etc/inittab
+#
+# x:a:once:/usr/bin/startDM
+#
+# and have /usr/bin/startDM start the DM in daemon mode if
+# a lock is present (with the info of what DM should be started),
+# else just fall through.
+#
+# How this basically works, is the "a" runlevel is a additional
+# runlevel that you can use to fork processes with init, but the
+# runlevel never gets changed to this runlevel. Along with the "a"
+# runlevel, the "once" key word means that startDM will only be
+# run when we specify it to run, thus eliminating respawning
+# startDM when "display-manager" is not added to the default
+# runlevel, as was done previously.
+#
+# This script then just calls "telinit a", and init will run
+# /usr/bin/startDM after the current runlevel completes (this
+# script should only be added to the actual runlevel the user is
+# using).
+#
+# Martin Schlemmer
+# aka Azarah
+# 04 March 2002
+
+depend() {
+ need localmount display-manager-setup
+
+ # this should start as early as possible
+ # we can't do 'before *' as that breaks it
+ # (#139824) Start after ypbind and autofs for network authentication
+ # (#145219 #180163) Could use lirc mouse as input device
+ # (#70689 comment #92) Start after consolefont to avoid display corruption
+ # (#291269) Start after quota, since some dm need readable home
+ # (#390609) gdm-3 will fail when dbus is not running
+ # (#366753) starting keymaps after X causes problems
+ after bootmisc consolefont modules netmount
+ after readahead-list ypbind autofs openvpn gpm lircmd
+ after quota keymaps
+ before alsasound
+
+ # Start before GUI
+ use dbus xfs
+}
+
+setup_dm() {
+ local MY_XDM
+
+ MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')
+
+ NAME=
+ case "${MY_XDM}" in
+ kdm|kde)
+ # Load our root path from profile.env
+ # Needed for kdm
+ PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")
+ EXE=/usr/bin/kdm
+ PIDFILE=/run/kdm.pid
+ ;;
+ entrance*)
+ EXE=/usr/sbin/entrance
+ PIDFILE=/run/entrance.pid
+ ;;
+ gdm|gnome)
+ # gdm-3 and above has different paths
+ if [ -f /usr/sbin/gdm ]; then
+ EXE=/usr/sbin/gdm
+ PIDFILE=/run/gdm/gdm.pid
+ START_STOP_ARGS="--background"
+ AUTOCLEAN_CGROUP="yes"
+ else
+ EXE=/usr/bin/gdm
+ PIDFILE=/run/gdm.pid
+ fi
+ [ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary
+ ;;
+ greetd)
+ EXE=/usr/bin/greetd
+ PIDFILE=/run/greetd.pid
+ START_STOP_ARGS="-m --background"
+ ;;
+ wdm)
+ EXE=/usr/bin/wdm
+ PIDFILE=
+ ;;
+ gpe)
+ EXE=/usr/bin/gpe-dm
+ PIDFILE=/run/gpe-dm.pid
+ ;;
+ lxdm)
+ EXE=/usr/sbin/lxdm-binary
+ PIDFILE=/run/lxdm.pid
+ START_STOP_ARGS="--background"
+ ;;
+ lightdm)
+ EXE=/usr/sbin/lightdm
+ PIDFILE=/run/lightdm.pid
+ START_STOP_ARGS="--background"
+ ;;
+ sddm)
+ EXE="/usr/bin/sddm"
+ START_STOP_ARGS="-m --background"
+ PIDFILE=/run/sddm.pid
+ ;;
+ *)
+ # first find out if there is such executable
+ EXE="$(command -v ${MY_XDM} 2>/dev/null)"
+ PIDFILE="/run/${MY_XDM}.pid"
+
+ # warn user that they are doing sick things if the exe was not found
+ if [ -z "${EXE}" ]; then
+ echo "ERROR: Your XDM value is invalid."
+ echo " No ${MY_XDM} executable could be found on your system."
+ fi
+ ;;
+ esac
+
+ if ! [ -x "${EXE}" ]; then
+ EXE=/usr/bin/xdm
+ PIDFILE=/run/xdm.pid
+ if ! [ -x "/usr/bin/xdm" ]; then
+ echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm,"
+ echo " or install x11-apps/xdm package"
+ eend 255
+ fi
+ fi
+}
+
+# Check to see if something is defined on our VT
+vtstatic() {
+ if [ -e /etc/inittab ] ; then
+ grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab
+ elif [ -e /etc/ttys ] ; then
+ grep -q "^ttyv$(($1 - 1))" /etc/ttys
+ else
+ return 1
+ fi
+}
+
+start() {
+ local EXE NAME PIDFILE AUTOCLEAN_CGROUP
+ setup_dm
+
+ if [ -f /run/.nogui ]; then
+ einfo "Skipping ${EXE##*/}, /run/.nogui found or 'nogui' bootparam passed."
+ rm /run/.nogui
+ return 0
+ fi
+
+ ebegin "Setting up ${EXE##*/}"
+
+ # save the prefered DM
+ save_options "service" "${EXE}"
+ save_options "name" "${NAME}"
+ save_options "pidfile" "${PIDFILE}"
+ save_options "start_stop_args" "${START_STOP_ARGS}"
+ save_options "autoclean_cgroup" "${AUTOCLEAN_CGROUP:-no}"
+
+ if [ -n "${CHECKVT-y}" ] ; then
+ if vtstatic "${CHECKVT:-7}" ; then
+ if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then
+ ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later"
+ telinit a >/dev/null 2>&1
+ return 0
+ else
+ eerror "Something is already defined on VT ${CHECKVT:-7}, not starting"
+ return 1
+ fi
+ fi
+ fi
+
+ /usr/bin/startDM
+ eend 0
+}
+
+stop() {
+ local curvt retval
+
+ retval=0
+ if [ -t 0 ]; then
+ if type fgconsole >/dev/null 2>&1; then
+ curvt=$(fgconsole 2>/dev/null)
+ else
+ curvt=$(tty)
+ case "${curvt}" in
+ /dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;;
+ *) curvt= ;;
+ esac
+ fi
+ fi
+ local myexe myname mypidfile myservice
+ myexe=$(get_options "service")
+ myname=$(get_options "name")
+ mypidfile=$(get_options "pidfile")
+ myservice=${myexe##*/}
+ yesno "${rc_cgroup_cleanup:-no}" || rc_cgroup_cleanup=$(get_options "autoclean_cgroup")
+
+ [ -z "${myexe}" ] && return 0
+
+ ebegin "Stopping ${myservice}"
+
+ if start-stop-daemon --quiet --test --stop --exec "${myexe}" 2>/dev/null; then
+ start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \
+ "${mypidfile:+--pidfile}" "${mypidfile}" \
+ "${myname:+--name}" "${myname}"
+ retval=${?}
+ fi
+
+ # switch back to original vt
+ if [ -n "${curvt}" ]; then
+ if type chvt >/dev/null 2>&1; then
+ chvt "${curvt}"
+ else
+ vidcontrol -s "$((curvt + 1))"
+ fi
+ fi
+
+ eend ${retval} "Error stopping ${myservice}"
+ return ${retval}
+}
+
+# vim: set ts=4 :
diff --git a/gui-libs/display-manager-init/files/startDM b/gui-libs/display-manager-init/files/startDM
new file mode 100644
index 00000000000..976d1dd2d56
--- /dev/null
+++ b/gui-libs/display-manager-init/files/startDM
@@ -0,0 +1,29 @@
+#!/bin/sh
+# Copyright 1999-2020 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
diff --git a/gui-libs/display-manager-init/files/xdm.initd b/gui-libs/display-manager-init/files/xdm.initd
new file mode 100644
index 00000000000..2fce43b0f47
--- /dev/null
+++ b/gui-libs/display-manager-init/files/xdm.initd
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2
+
+depend() {
+ need display-manager
+}
+
+start() {
+ return
+}
+
+# vim: set ts=4 :
diff --git a/gui-libs/display-manager-init/metadata.xml b/gui-libs/display-manager-init/metadata.xml
new file mode 100644
index 00000000000..7a7bbf81054
--- /dev/null
+++ b/gui-libs/display-manager-init/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gui-libs/display-manager-init/files/, gui-libs/display-manager-init/
@ 2021-02-26 19:24 Piotr Karbowski
0 siblings, 0 replies; 4+ messages in thread
From: Piotr Karbowski @ 2021-02-26 19:24 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gui-libs/display-manager-init/files/, gui-libs/display-manager-init/
@ 2021-02-26 19:24 Piotr Karbowski
0 siblings, 0 replies; 4+ messages in thread
From: Piotr Karbowski @ 2021-02-26 19:24 UTC (permalink / raw
To: gentoo-commits
commit: 460a8b933204f6b8788075f8faca640c15794c5e
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Fri Feb 26 19:11:04 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=460a8b93
gui-libs/display-manager-init: drop old versions
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/19673
Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>
.../display-manager-init-1.0-r1.ebuild | 54 ---------------------
.../display-manager-init-1.0-r2.ebuild | 55 ----------------------
gui-libs/display-manager-init/files/startDM | 29 ------------
3 files changed, 138 deletions(-)
diff --git a/gui-libs/display-manager-init/display-manager-init-1.0-r1.ebuild b/gui-libs/display-manager-init/display-manager-init-1.0-r1.ebuild
deleted file mode 100644
index d5a588002df..00000000000
--- a/gui-libs/display-manager-init/display-manager-init-1.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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
-"
-
-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
- exeinto /usr/bin
- doexe "${FILESDIR}"/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/display-manager-init-1.0-r2.ebuild b/gui-libs/display-manager-init/display-manager-init-1.0-r2.ebuild
deleted file mode 100644
index 3c54378da25..00000000000
--- a/gui-libs/display-manager-init/display-manager-init-1.0-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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
- exeinto /usr/bin
- doexe "${FILESDIR}"/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 b/gui-libs/display-manager-init/files/startDM
deleted file mode 100644
index 976d1dd2d56..00000000000
--- a/gui-libs/display-manager-init/files/startDM
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2020 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
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gui-libs/display-manager-init/files/, gui-libs/display-manager-init/
@ 2022-10-09 22:10 Piotr Karbowski
0 siblings, 0 replies; 4+ messages in thread
From: Piotr Karbowski @ 2022-10-09 22:10 UTC (permalink / raw
To: gentoo-commits
commit: 856c7ecf226fcd8803d3e144a0ec97291de87a18
Author: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 9 22:08:58 2022 +0000
Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Sun Oct 9 22:10:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=856c7ecf
gui-libs/display-manager-init: 1.1 version bump
Following WilliamH suggestion, the init has been redone in a
openrc-friendly way, along with little cleanup and restore
support for nox boot parameter, since nox were with us since
always, good to still support it alongside nogui one.
Closes: https://bugs.gentoo.org/show_bug.cgi?id=774189
Closes: https://bugs.gentoo.org/show_bug.cgi?id=768729
Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>
.../display-manager-init-1.1.ebuild | 54 ++++++
.../files/display-manager-setup.initd-r1 | 13 ++
.../files/display-manager.initd-r3 | 201 +++++++++++++++++++++
3 files changed, 268 insertions(+)
diff --git a/gui-libs/display-manager-init/display-manager-init-1.1.ebuild b/gui-libs/display-manager-init/display-manager-init-1.1.ebuild
new file mode 100644
index 000000000000..adecdb877f9e
--- /dev/null
+++ b/gui-libs/display-manager-init/display-manager-init-1.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 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 ~loong ~m68k ~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-r1 display-manager-setup
+ newinitd "${FILESDIR}"/display-manager.initd-r3 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/display-manager-setup.initd-r1 b/gui-libs/display-manager-init/files/display-manager-setup.initd-r1
new file mode 100644
index 000000000000..a897bf990af8
--- /dev/null
+++ b/gui-libs/display-manager-init/files/display-manager-setup.initd-r1
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need localmount
+}
+
+start() {
+ if get_bootparam "nogui" || get_bootparam "nox"; then
+ touch /run/.nogui
+ fi
+}
diff --git a/gui-libs/display-manager-init/files/display-manager.initd-r3 b/gui-libs/display-manager-init/files/display-manager.initd-r3
new file mode 100644
index 000000000000..8e94c2ea637b
--- /dev/null
+++ b/gui-libs/display-manager-init/files/display-manager.initd-r3
@@ -0,0 +1,201 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2
+
+retry="TERM/5/TERM/5"
+
+# This is here to serve as a note to myself, and future developers.
+#
+# Any Display manager (gdm,kdm,xdm) has the following problem: if
+# it is started before any getty, and no vt is specified, it will
+# usually run on vt2. When the getty on vt2 then starts, and the
+# DM is already started, the getty will take control of the keyboard,
+# leaving us with a "dead" keyboard.
+#
+# Resolution: add the following line to /etc/inittab
+#
+# x:a:once:/usr/bin/startDM
+#
+# and have /usr/bin/startDM start the DM in daemon mode if
+# a lock is present (with the info of what DM should be started),
+# else just fall through.
+#
+# How this basically works, is the "a" runlevel is a additional
+# runlevel that you can use to fork processes with init, but the
+# runlevel never gets changed to this runlevel. Along with the "a"
+# runlevel, the "once" key word means that startDM will only be
+# run when we specify it to run, thus eliminating respawning
+# startDM when "display-manager" is not added to the default
+# runlevel, as was done previously.
+#
+# This script then just calls "telinit a", and init will run
+# /usr/bin/startDM after the current runlevel completes (this
+# script should only be added to the actual runlevel the user is
+# using).
+#
+# Martin Schlemmer
+# aka Azarah
+# 04 March 2002
+
+depend() {
+ need localmount display-manager-setup
+
+ # this should start as early as possible
+ # we can't do 'before *' as that breaks it
+ # (#139824) Start after ypbind and autofs for network authentication
+ # (#145219 #180163) Could use lirc mouse as input device
+ # (#70689 comment #92) Start after consolefont to avoid display corruption
+ # (#291269) Start after quota, since some dm need readable home
+ # (#390609) gdm-3 will fail when dbus is not running
+ # (#366753) starting keymaps after X causes problems
+ # (#768834) race condition with elogind
+ after bootmisc consolefont modules netmount
+ after readahead-list ypbind autofs openvpn gpm lircmd
+ after quota keymaps
+ after elogind
+ after sssd
+ before alsasound
+
+ # Start before GUI
+ use dbus xfs
+}
+
+setup_dm() {
+ local MY_XDM
+
+ MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')
+ case "${MY_XDM}" in
+ kdm|kde)
+ command=/usr/bin/kdm
+ pidfile=/run/kdm.pid
+ ;;
+ entrance*)
+ command=/usr/sbin/entrance
+ pidfile=/run/entrance.pid
+ ;;
+ gdm|gnome)
+ # gdm-3 and above has different paths
+ if [ -f /usr/sbin/gdm ]; then
+ command=/usr/sbin/gdm
+ pidfile=/run/gdm/gdm.pid
+ start_stop_daemon_args="--background"
+ else
+ command=/usr/bin/gdm
+ pidfile=/run/gdm.pid
+ fi
+ [ "${RC_UNAME}" != "Linux" ] && name=gdm-binary
+ ;;
+ greetd)
+ command=/usr/bin/greetd
+ command_background=yes
+ pidfile=/run/greetd.pid
+ ;;
+ wdm)
+ command=/usr/bin/wdm
+ ;;
+ gpe)
+ command=/usr/bin/gpe-dm
+ pidfile=/run/gpe-dm.pid
+ ;;
+ lxdm)
+ command=/usr/sbin/lxdm-binary
+ pidfile=/run/lxdm.pid
+ start_stop_daemon_args="--background"
+ ;;
+ lightdm)
+ command=/usr/sbin/lightdm
+ pidfile=/run/lightdm.pid
+ start_stop_daemon_args="--background"
+ ;;
+ sddm)
+ command="/usr/bin/sddm"
+ command_background=yes
+ pidfile=/run/sddm.pid
+ ;;
+ *)
+ # first find out if there is such executable
+ command="$(command -v ${MY_XDM} 2>/dev/null)"
+ pidfile="/run/${MY_XDM}.pid"
+
+ # warn user that they are doing sick things if the exe was not found
+ if [ -z "${EXE}" ]; then
+ eerror "ERROR: Your XDM value is invalid."
+ eerror " No ${MY_XDM} executable could be found on your system."
+ fi
+ ;;
+ esac
+
+ if ! [ -x "${command}" ]; then
+ command=/usr/bin/xdm
+ pidfile=/run/xdm.pid
+ if ! [ -x "/usr/bin/xdm" ]; then
+ eerror "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/display-manager,"
+ eerror " or install the x11-apps/xdm package"
+ return 1
+ fi
+ fi
+ return 0
+}
+
+# Check to see if something is defined on our VT
+vtstatic() {
+ if [ -e /etc/inittab ] ; then
+ grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab
+ elif [ -e /etc/ttys ] ; then
+ grep -q "^ttyv$(($1 - 1))" /etc/ttys
+ else
+ return 1
+ fi
+ return
+}
+
+start_pre() {
+ setup_dm || return
+
+ if [ -f /run/.nogui ]; then
+ einfo "Skipping ${command##*/}, /run/.nogui found or 'nogui' bootparam passed."
+ rm /run/.nogui
+ return 1
+ fi
+
+ if vtstatic "${CHECKVT:-7}" ; then
+ if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then
+ ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later"
+ telinit a >/dev/null 2>&1
+ return 0
+ else
+ eerror "Something is already defined on VT ${CHECKVT:-7}, not starting"
+ return 1
+ fi
+ fi
+ return 0
+}
+
+stop_pre() {
+ if [ -t 0 ]; then
+ if command -v fgconsole >/dev/null 2>&1; then
+ curvt=$(fgconsole 2>/dev/null)
+ else
+ curvt=$(tty)
+ case "${curvt}" in
+ /dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;;
+ *) curvt= ;;
+ esac
+ fi
+ fi
+ return
+}
+
+stop_post() {
+ # switch back to original vt
+ if [ -n "${curvt}" ]; then
+ if type chvt >/dev/null 2>&1; then
+ chvt "${curvt}"
+ else
+ vidcontrol -s "$((curvt + 1))"
+ fi
+ fi
+ return
+}
+
+# vim: set ts=4 :
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-10-09 22:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-30 19:21 [gentoo-commits] repo/gentoo:master commit in: gui-libs/display-manager-init/files/, gui-libs/display-manager-init/ Piotr Karbowski
-- strict thread matches above, loose matches on Subject: below --
2021-02-26 19:24 Piotr Karbowski
2021-02-26 19:24 Piotr Karbowski
2022-10-09 22:10 Piotr Karbowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox