From 85c07c7568e127428bf1ec8c2c16236bab07cee3801e59ec2165b9458280949c Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 25 Sep 2015 12:03:39 +0000 Subject: [PATCH] Accepting request 333462 from openSUSE:Factory:Staging:J - display-manager.service: require and conflict getty@tty7.service: this is copied from gdm.service and is hopefully helping with the race condition, where X is often not able to start up on VT7 due to missing permissions. (boo#939594) - rename README.SuSE file to README.SUSE (bnc#938737, FATE#316521) OBS-URL: https://build.opensuse.org/request/show/333462 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=106 --- display-manager.service | 3 ++- xdm.changes | 13 +++++++++++++ xdm.spec | 2 +- xdm.tar.bz2 | 4 ++-- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/display-manager.service b/display-manager.service index 10d6729..94f7596 100644 --- a/display-manager.service +++ b/display-manager.service @@ -1,9 +1,10 @@ [Unit] Description=X Display Manager Requires=var-run.mount +Conflicts=getty@tty7.service plymouth-quit.service After=ypbind.service gpm.service time-sync.target winbind.service acpid.service Wants=remote-fs.target dbus.socket systemd-user-sessions.service -After=remote-fs.target dbus.socket systemd-user-sessions.service +After=remote-fs.target dbus.socket systemd-user-sessions.service getty@tty7.service plymouth-quit.service [Service] Type=forking diff --git a/xdm.changes b/xdm.changes index 6e04b2c..37cd05a 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Sep 14 11:48:31 UTC 2015 - dimstar@opensuse.org + +- display-manager.service: require and conflict getty@tty7.service: + this is copied from gdm.service and is hopefully helping with + the race condition, where X is often not able to start up on + VT7 due to missing permissions. (boo#939594) + ------------------------------------------------------------------- Tue Aug 4 10:00:09 UTC 2015 - eich@suse.com @@ -27,6 +35,11 @@ Wed Jul 29 12:48:28 UTC 2015 - werner@suse.de - Use xli aka xsetbg if xpmroot is not available (hint from jemoreno@novell.com) +------------------------------------------------------------------- +Mon Jul 20 12:52:59 UTC 2015 - sndirsch@suse.com + +- rename README.SuSE file to README.SUSE (bnc#938737, FATE#316521) + ------------------------------------------------------------------- Tue Mar 17 13:12:32 UTC 2015 - dvlaeev@suse.com diff --git a/xdm.spec b/xdm.spec index 78d9a44..5c8e326 100644 --- a/xdm.spec +++ b/xdm.spec @@ -1,7 +1,7 @@ # # spec file for package xdm # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/xdm.tar.bz2 b/xdm.tar.bz2 index 7601479..cb9e098 100644 --- a/xdm.tar.bz2 +++ b/xdm.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f0b8b196efef25b05735d332b1cd9b702be29654380dc6968b0e37fbfae7cc0 -size 22312 +oid sha256:a03a6710bf3c15de7629198391be2451ce0c4f5132a59d9a650c911197af8b06 +size 22182