From a99e8f04336925f15b2782f95b418a7283448acbe524b206e6d1186a8150cfda Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 9 Oct 2015 15:00:11 +0000 Subject: [PATCH 1/3] - display-manager script: * Only fix permissions and ownership of the console if display manager has crashed or was killed. This should avoid races with systemd-logind which modifies the permissions as well. * Only create the link to the PID file if the DM has started successfully. (boo#939594). OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=108 --- xdm.changes | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/xdm.changes b/xdm.changes index 37cd05a..21a9f0f 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,10 +1,12 @@ ------------------------------------------------------------------- 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) +- display-manager script: + * Only fix permissions and ownership of the console if display manager + has crashed or was killed. This should avoid races with systemd-logind + which modifies the permissions as well. + * Only create the link to the PID file if the DM has started successfully. + (boo#939594). ------------------------------------------------------------------- Tue Aug 4 10:00:09 UTC 2015 - eich@suse.com From 33563deaf04b521330aa8d58d9295f045504e48d8ef308d38eb21d37bb72e422 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 9 Oct 2015 17:17:43 +0000 Subject: [PATCH 2/3] - Reverting last change. OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=109 --- xdm.changes | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/xdm.changes b/xdm.changes index 21a9f0f..37cd05a 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,12 +1,10 @@ ------------------------------------------------------------------- Mon Sep 14 11:48:31 UTC 2015 - dimstar@opensuse.org -- display-manager script: - * Only fix permissions and ownership of the console if display manager - has crashed or was killed. This should avoid races with systemd-logind - which modifies the permissions as well. - * Only create the link to the PID file if the DM has started successfully. - (boo#939594). +- 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 From e88ba66ed2fb86836f9a90b73a8d82bfe19d00fc8d87a3948ed3602417d40a26 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 9 Oct 2015 17:30:42 +0000 Subject: [PATCH 3/3] Accepting request 336909 from home:dimstar:Factory Fix boo939594 - X.org does not (always) have access to /dev/tty7... fixed as described in comment 38; I'm just running a couple openQA runs with this version of xdm, so let it sit until I get some confirmations from there... just so you know you do not have to do any work on it: the fix is ready for you OBS-URL: https://build.opensuse.org/request/show/336909 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=110 --- xdm.changes | 10 ++++++++++ xdm.tar.bz2 | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/xdm.changes b/xdm.changes index 37cd05a..356b7c0 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Oct 7 07:25:37 UTC 2015 - dimstar@opensuse.org + +- Fix display-manager wrapper: only call TakeDevices in case $DM + actually fails to start. This was the reason why gdm often failed + to start with permission denied (depending on timing, gdm might + fired up X before TakeDevices passed, X would receive the tty7 + by means of logind and TakeDevices reset the permissions again) + (boo#939594). + ------------------------------------------------------------------- Mon Sep 14 11:48:31 UTC 2015 - dimstar@opensuse.org diff --git a/xdm.tar.bz2 b/xdm.tar.bz2 index cb9e098..30e68ef 100644 --- a/xdm.tar.bz2 +++ b/xdm.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a03a6710bf3c15de7629198391be2451ce0c4f5132a59d9a650c911197af8b06 -size 22182 +oid sha256:fc34232c6e673ab4f0f08247200679ac53f5d645aa02f3a8c461f52678d827f6 +size 22230