[gentoo-commits] repo/gentoo:master commit in: gui-libs/display-manager-init/, gui-libs/display-manager-init/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     d31814390355efc67e3a9749ac9a945c2eb7bf34
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Fri Feb  5 22:38:23 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb  5 22:45:59 2021 +0000
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 <gentoo <AT> aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/19348
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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