pool/xdm
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 593848 from X11:XOrg

Browse Source 
- systemd-logind integration requires to use -keeptty with X server
  to hold the controlling tty (and breaks startx!).[boo#1088365]
- Do not generate an error on not existing shell functions *_vars
  in /usr/lib/X11/display-manager

OBS-URL: https://build.opensuse.org/request/show/593848
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xdm?expand=0&rev=70
This commit is contained in:
Dominique Leuenberger 2018-04-07 18:50:23 +00:00 committed by Git OBS Bridge
commit ec77f79ad6
2 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
xdm-with-update-alternative.patch
View File

@ -1,7 +1,23 @@
diff -ur xdm.old/usr/lib/X11/display-manager xdm.new/usr/lib/X11/display-manager ---
--- xdm.old/usr/lib/X11/display-manager 2017-02-06 14:19:33.541035000 +0100 etc/X11/xdm/Xservers | 3 ++-
+++ xdm.new/usr/lib/X11/display-manager 2017-10-12 15:44:06.592204792 +0200 usr/lib/X11/display-manager | 7 +++++--
@@ -109,6 +109,8 @@ var/adm/fillup-templates/sysconfig.displaymanager | 8 --------
3 files changed, 7 insertions(+), 11 deletions(-)
--- xdm.old/etc/X11/xdm/Xservers 2018-04-05 14:48:56.669172739 +0200
+++ xdm.new/etc/X11/xdm/Xservers 2018-04-05 14:45:33.129981406 +0200
@@ -13,6 +13,7 @@
# use such a line to enable the console login option in the kdm menu
#:0 local@tty1 /usr/bin/X vt7
# "reserve" means that the X server gets only started on request (only kdm)
+# -keeptty implies that controlling tty is not detached (breaks startx!)
-:0 local /usr/bin/X -nolisten tcp -br vt7
+:0 local /usr/bin/X -nolisten tcp -br vt7 -keeptty
--- xdm.old/usr/lib/X11/display-manager
+++ xdm.new/usr/lib/X11/display-manager 2018-04-05 12:44:11.247521173 +0000
@@ -121,6 +121,8 @@ plymouth_quit()
#set -x #set -x
@ -10,17 +26,20 @@ diff -ur xdm.old/usr/lib/X11/display-manager xdm.new/usr/lib/X11/display-manager
DM=${DISPLAYMANAGER##*/} DM=${DISPLAYMANAGER##*/}
case "$DM" in case "$DM" in
@@ -127,6 +129,7 @@ @@ -138,8 +140,9 @@ case "$DM" in
for i in $DISPLAY_MANAGERS
do do
name="${i}_vars" name="${i}_vars"
PIDFILE=/var/run/$i.pid; - PIDFILE=/var/run/$i.pid;
+ type $name > /dev/null || continue; - $name $DM && break;
$name $DM && break; + type -t $name &> /dev/null || continue
+ PIDFILE=/var/run/$i.pid
+ $name $DM && break
done done
if [ -z "$DISPLAYMANAGER" -o ! -x "$DISPLAYMANAGER" ] if [ -z "$DISPLAYMANAGER" -o ! -x "$DISPLAYMANAGER" ]
diff -ur xdm.old/var/adm/fillup-templates/sysconfig.displaymanager xdm.new/var/adm/fillup-templates/sysconfig.displaymanager then
--- xdm.old/var/adm/fillup-templates/sysconfig.displaymanager 2017-01-04 11:15:56.259500000 +0100 --- xdm.old/var/adm/fillup-templates/sysconfig.displaymanager
+++ xdm.new/var/adm/fillup-templates/sysconfig.displaymanager 2017-10-12 16:35:23.775259305 +0200 +++ xdm.new/var/adm/fillup-templates/sysconfig.displaymanager 2017-10-12 14:35:23.775259305 +0000
@@ -1,14 +1,6 @@ @@ -1,14 +1,6 @@
## Path: Desktop/Display manager ## Path: Desktop/Display manager
## Description: settings to generate a proper displaymanager config ## Description: settings to generate a proper displaymanager config

8
xdm.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Apr 5 12:30:01 UTC 2018 - werner@suse.de
- systemd-logind integration requires to use -keeptty with X server
to hold the controlling tty (and breaks startx!).[boo#1088365]
- Do not generate an error on not existing shell functions *_vars
in /usr/lib/X11/display-manager
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 16 16:44:52 UTC 2018 - sndirsch@suse.com Fri Mar 16 16:44:52 UTC 2018 - sndirsch@suse.com