[gentoo-commits] repo/gentoo:master commit in: gui-libs/display-manager-init/, gui-libs/display-manager-init/files/
commit: 0759e39809ee94ea821269480a0ed65fd593ba9e
Author: Piotr Karbowski gentoo org>
AuthorDate: Sun Dec 4 20:02:07 2022 +
Commit: Piotr Karbowski gentoo org>
CommitDate: Sun Dec 4 20:02:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0759e398
gui-libs/display-manager-init: 1.1.2 version bump
Closes: https://bugs.gentoo.org/884039
Signed-off-by: Piotr Karbowski gentoo.org>
.../display-manager-init-1.1.2.ebuild | 54 ++
.../files/display-manager.initd-r5 | 201 +
2 files changed, 255 insertions(+)
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.ebuild
new file mode 100644
index ..67365361d4cd
--- /dev/null
+++ b/gui-libs/display-manager-init/display-manager-init-1.1.2.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-r5 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.initd-r5
b/gui-libs/display-manager-init/files/display-manager.initd-r5
new file mode 100644
index ..3fff478ebc9e
--- /dev/null
+++ b/gui-libs/display-manager-init/files/display-manager.initd-r5
@@ -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
[gentoo-commits] repo/gentoo:master commit in: gui-libs/display-manager-init/, gui-libs/display-manager-init/files/
commit: af75640e7c22196db0de32e016a737119e92c336
Author: Piotr Karbowski gentoo org>
AuthorDate: Mon Oct 10 17:31:10 2022 +
Commit: Piotr Karbowski gentoo org>
CommitDate: Mon Oct 10 17:31:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af75640e
gui-libs/display-manager-init: 1.1.1 version bump
Closes: https://bugs.gentoo.org/876412
Signed-off-by: Piotr Karbowski gentoo.org>
...isplay-manager-init-1.1.ebuild => display-manager-init-1.1.1.ebuild} | 2 +-
.../files/{display-manager.initd-r3 => display-manager.initd-r4}| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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.1.ebuild
similarity index 96%
rename from gui-libs/display-manager-init/display-manager-init-1.1.ebuild
rename to gui-libs/display-manager-init/display-manager-init-1.1.1.ebuild
index adecdb877f9e..a8d86b970cd2 100644
--- a/gui-libs/display-manager-init/display-manager-init-1.1.ebuild
+++ b/gui-libs/display-manager-init/display-manager-init-1.1.1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
src_install() {
newinitd "${FILESDIR}"/display-manager-setup.initd-r1
display-manager-setup
- newinitd "${FILESDIR}"/display-manager.initd-r3 display-manager
+ newinitd "${FILESDIR}"/display-manager.initd-r4 display-manager
newinitd "${FILESDIR}"/xdm.initd xdm
newconfd "${FILESDIR}"/display-manager.confd display-manager
newbin "${FILESDIR}"/startDM-r1 startDM
diff --git a/gui-libs/display-manager-init/files/display-manager.initd-r3
b/gui-libs/display-manager-init/files/display-manager.initd-r4
similarity index 99%
rename from gui-libs/display-manager-init/files/display-manager.initd-r3
rename to gui-libs/display-manager-init/files/display-manager.initd-r4
index 8e94c2ea637b..460c91e86944 100644
--- a/gui-libs/display-manager-init/files/display-manager.initd-r3
+++ b/gui-libs/display-manager-init/files/display-manager.initd-r4
@@ -189,7 +189,7 @@ stop_pre() {
stop_post() {
# switch back to original vt
if [ -n "${curvt}" ]; then
- if type chvt >/dev/null 2>&1; then
+ if command -v chvt >/dev/null 2>&1; then
chvt "${curvt}"
else
vidcontrol -s "$((curvt + 1))"
[gentoo-commits] repo/gentoo:master commit in: gui-libs/display-manager-init/, gui-libs/display-manager-init/files/
commit: 86b355a66051f7029595f2639b77e3d1e7be8ec3
Author: Piotr Karbowski gentoo org>
AuthorDate: Sun May 22 08:35:27 2022 +
Commit: Piotr Karbowski gentoo org>
CommitDate: Sun May 22 08:37:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86b355a6
gui-libs/display-manager-init: r4 revbump with multiple fixes.
Closes: https://bugs.gentoo.org/show_bug.cgi?id=843848
Closes: https://bugs.gentoo.org/show_bug.cgi?id=815667
Closes: https://bugs.gentoo.org/show_bug.cgi?id=811489
Signed-off-by: Piotr Karbowski gentoo.org>
.../display-manager-init-1.0-r4.ebuild | 54 +
.../files/display-manager.initd-r2 | 237 +
2 files changed, 291 insertions(+)
diff --git a/gui-libs/display-manager-init/display-manager-init-1.0-r4.ebuild
b/gui-libs/display-manager-init/display-manager-init-1.0-r4.ebuild
new file mode 100644
index ..7ae3482802fa
--- /dev/null
+++ b/gui-libs/display-manager-init/display-manager-init-1.0-r4.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 display-manager-setup
+ newinitd "${FILESDIR}"/display-manager.initd-r2 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.initd-r2
b/gui-libs/display-manager-init/files/display-manager.initd-r2
new file mode 100644
index ..285ac6a717c4
--- /dev/null
+++ b/gui-libs/display-manager-init/files/display-manager.initd-r2
@@ -0,0 +1,237 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 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
+ #
[gentoo-commits] repo/gentoo:master commit in: gui-libs/display-manager-init/, gui-libs/display-manager-init/files/
commit: d31814390355efc67e3a9749ac9a945c2eb7bf34
Author: Aisha Tammy aisha cc>
AuthorDate: Fri Feb 5 22:38:23 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Feb 5 22:45:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3181439
gui-libs/display-manager-init: start after elogind
fixes race condition with elogind
Closes: https://bugs.gentoo.org/768834
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Aisha Tammy aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/19348
Signed-off-by: Andreas Sturmlechner gentoo.org>
...lay-manager-init-1.0.ebuild => display-manager-init-1.0-r1.ebuild} | 2 +-
.../files/{display-manager.initd => display-manager.initd-r1} | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
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-r1.ebuild
similarity index 96%
rename from gui-libs/display-manager-init/display-manager-init-1.0.ebuild
rename to gui-libs/display-manager-init/display-manager-init-1.0-r1.ebuild
index ec9d323f4c0..d5a588002df 100644
--- a/gui-libs/display-manager-init/display-manager-init-1.0.ebuild
+++ b/gui-libs/display-manager-init/display-manager-init-1.0-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
src_install() {
newinitd "${FILESDIR}"/display-manager-setup.initd display-manager-setup
- newinitd "${FILESDIR}"/display-manager.initd display-manager
+ newinitd "${FILESDIR}"/display-manager.initd-r1 display-manager
newinitd "${FILESDIR}"/xdm.initd xdm
newconfd "${FILESDIR}"/display-manager.confd display-manager
exeinto /usr/bin
diff --git a/gui-libs/display-manager-init/files/display-manager.initd
b/gui-libs/display-manager-init/files/display-manager.initd-r1
similarity index 98%
rename from gui-libs/display-manager-init/files/display-manager.initd
rename to gui-libs/display-manager-init/files/display-manager.initd-r1
index e650df9600e..9402e969f4a 100644
--- a/gui-libs/display-manager-init/files/display-manager.initd
+++ b/gui-libs/display-manager-init/files/display-manager.initd-r1
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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.
@@ -46,9 +46,11 @@ depend() {
# (#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
before alsasound
# Start before GUI
