SHA256
1
0
forked from pool/xdm
* make previous change in /etc/sysconfig/displaymanager instead
    of /var/adm/fillup-templates/sysconfig.displaymanager

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=145
This commit is contained in:
Stefan Dirsch 2017-07-24 14:23:57 +00:00 committed by Git OBS Bridge
parent 3491b2bf95
commit 83d1ec3cc2
2 changed files with 15 additions and 8 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jul 24 14:21:45 UTC 2017 - sndirsch@suse.com
- %post
* make previous change in /etc/sysconfig/displaymanager instead
of /var/adm/fillup-templates/sysconfig.displaymanager
-------------------------------------------------------------------
Mon Jul 24 13:43:35 UTC 2017 - sndirsch@suse.com

View File

@ -173,20 +173,20 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm
%endif
%post
# Do no try to start Xserver on platforms which may ship without
# graphics card (bsc#1039497)
%ifarch aarch64 ppc64le
if ! [ -c /dev/fb* -o -d /dev/dri ]; then
sed -i -e "s+DISPLAYMANAGER_STARTS_XSERVER=.*+DISPLAYMANAGER_STARTS_XSERVER=\"no\"+g" \
var/adm/fillup-templates/sysconfig.displaymanager
fi
%endif
%if 0%{?suse_version} < 1315
%{fillup_and_insserv -Y xdm}
%else
%service_add_post display-manager.service
%{fillup_only -n displaymanager}
%endif
# Do no try to start Xserver on platforms which may ship without
# graphics card (bsc#1039497)
%ifarch aarch64 ppc64le
if ! [ -c /dev/fb* -o -d /dev/dri ]; then
sed -i -e "s+DISPLAYMANAGER_STARTS_XSERVER=.*+DISPLAYMANAGER_STARTS_XSERVER=\"no\"+g" \
/etc/sysconfig/displaymanager
fi
%endif
%pre
%if !0%{?suse_version} < 1315