mirror of
https://git.yoctoproject.org/poky
synced 2026-04-29 18:32:20 +02:00
3b7cdffebd
This commit should provide the same functionality as before, but should make meta-oe xserver-nodm-init-2.0 obsolete as well as keep systemd and sysvinit startup better in sync. /etc/X11/Xserver is not called anymore: it is provided by both x11-common and xserver-common with no useful differences (but some annoying ones). Instead xserver-nodm-init provides /etc/xserver-nodm/Xserver as the startup script and /etc/default/xserver-nodm as the default settings file. These are used by both init systems. The Xserver script could be completely removed (with sysv and systemd calling xinit directly), but to keep compatibility with meta-oes xserver-nodm-init-2.0 the Xserver script sources /etc/X11/xserver-common if one exists -- and systemd EnvironmentFile cannot do that. x11-common used to have a packageconfig to easily control screen blanking. Move this to xserver-nodm-init. (From OE-Core rev: e8ce3d2626e505924a75de96650abca166fd230a) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
26 lines
652 B
Bash
26 lines
652 B
Bash
#!/bin/sh
|
|
|
|
# This script is only needed to make sure /etc/X11/xserver-common
|
|
# can affect XSERVER, ARGS & DPI: otherwise systemd could just use
|
|
# /etc/default/xserver-nodm as EnvironmentFile and sysvinit could just
|
|
# source the same file
|
|
|
|
. /etc/profile
|
|
|
|
# load default values for XSERVER, ARGS, DISPLAY...
|
|
. /etc/default/xserver-nodm
|
|
|
|
# Allow xserver-common to override ARGS, XSERVER, DPI
|
|
if [ -e /etc/X11/xserver-common ] ; then
|
|
. /etc/X11/xserver-common
|
|
if [ ! -e $XSERVER ] ; then
|
|
XSERVER=$(which $XSERVER)
|
|
fi
|
|
fi
|
|
|
|
if [ -n "$DPI" ] ; then
|
|
ARGS="$ARGS -dpi $DPI"
|
|
fi
|
|
|
|
exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
|