mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-01 15:07:49 +00:00
xorg-server: rework systemd service files
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
3a54941311
commit
8664322c24
@ -194,5 +194,7 @@ post_makeinstall_target() {
|
||||
|
||||
post_install() {
|
||||
enable_service xorg-monitor.path
|
||||
enable_service xorg-server.path
|
||||
enable_service xorg.service
|
||||
# enable_service xorg.path
|
||||
# enable_service xorg.target
|
||||
}
|
||||
|
@ -1,9 +1,9 @@
|
||||
[Unit]
|
||||
Description=Xorg configfile monitor
|
||||
After=xorg-server.service
|
||||
After=xorg.service
|
||||
|
||||
[Path]
|
||||
PathModified=/run/openelec/debug.conf
|
||||
|
||||
[Install]
|
||||
WantedBy=graphical.target
|
||||
WantedBy=xorg.target
|
||||
|
@ -1,10 +1,10 @@
|
||||
[Unit]
|
||||
Description=Xorg configfile monitor
|
||||
After=xorg-server.service
|
||||
After=xorg.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/bin/systemctl restart xorg-server.service
|
||||
|
||||
[Install]
|
||||
WantedBy=graphical.target
|
||||
WantedBy=xorg.target
|
||||
|
@ -5,4 +5,4 @@ Description=Xorg server configfile watcher
|
||||
PathExists=/run/openelec/xorg-settings.conf
|
||||
|
||||
[Install]
|
||||
WantedBy=graphical.target
|
||||
WantedBy=xorg.target
|
@ -1,8 +1,9 @@
|
||||
[Unit]
|
||||
Description=Xorg Server
|
||||
Conflicts=rescue.service rescue.target installer.target
|
||||
Requires=graphical.target
|
||||
After=multi-user.target
|
||||
Before=xorg.target
|
||||
|
||||
ConditionPathExists=/run/openelec/xorg-settings.conf
|
||||
|
||||
[Service]
|
||||
Environment=DISPLAY=:0.0
|
||||
@ -10,6 +11,7 @@ EnvironmentFile=/run/openelec/xorg-settings.conf
|
||||
EnvironmentFile=-/run/openelec/debug.conf
|
||||
ExecStart=/usr/bin/Xorg vt01 $XORG_ARGS $XORG_DEBUG
|
||||
Restart=always
|
||||
# RestartSec=10
|
||||
|
||||
[Install]
|
||||
WantedBy=graphical.target
|
||||
WantedBy=xorg.target
|
4
packages/x11/xserver/xorg-server/system.d/xorg.target
Normal file
4
packages/x11/xserver/xorg-server/system.d/xorg.target
Normal file
@ -0,0 +1,4 @@
|
||||
[Unit]
|
||||
Description=The basic Xorg server
|
||||
Conflicts=installer.target textmode.target rescue.target
|
||||
Before=graphical.target
|
@ -45,6 +45,6 @@ GOTO="end_video"
|
||||
|
||||
# configure Xorg
|
||||
LABEL="configure_xorg"
|
||||
ENV{xorg_driver}=="?*", RUN+="xorg-configure"
|
||||
ENV{xorg_driver}=="?*", RUN+="xorg-configure", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg.target"
|
||||
|
||||
LABEL="end_video"
|
||||
|
Loading…
x
Reference in New Issue
Block a user