summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAisha Tammy <gentoo@aisha.cc>2021-02-05 22:38:23 +0000
committerAndreas Sturmlechner <asturm@gentoo.org>2021-02-05 23:45:59 +0100
commitd31814390355efc67e3a9749ac9a945c2eb7bf34 (patch)
treec6a3c69be0be106aef21445a792aa85e3e0430fc
parentdev-ml/graphics: new package (diff)
downloadgentoo-d31814390355efc67e3a9749ac9a945c2eb7bf34.tar.gz
gentoo-d31814390355efc67e3a9749ac9a945c2eb7bf34.tar.bz2
gentoo-d31814390355efc67e3a9749ac9a945c2eb7bf34.zip
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 <gentoo@aisha.cc> Closes: https://github.com/gentoo/gentoo/pull/19348 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--gui-libs/display-manager-init/display-manager-init-1.0-r1.ebuild (renamed from gui-libs/display-manager-init/display-manager-init-1.0.ebuild)2
-rw-r--r--gui-libs/display-manager-init/files/display-manager.initd-r1 (renamed from gui-libs/display-manager-init/files/display-manager.initd)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
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
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