jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-02 07:27:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

xorg-server: rework systemd service files

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2013-08-17 03:48:14 +02:00
parent 3a54941311
commit 8664322c24
7 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/x11/xserver/xorg-server/package.mk
View File

@ -194,5 +194,7 @@ post_makeinstall_target() {
post_install() { post_install() {
enable_service xorg-monitor.path enable_service xorg-monitor.path
enable_service xorg-server.path enable_service xorg.service
# enable_service xorg.path
# enable_service xorg.target
} }

4
packages/x11/xserver/xorg-server/system.d/xorg-monitor.path
View File

@ -1,9 +1,9 @@
[Unit] [Unit]
Description=Xorg configfile monitor Description=Xorg configfile monitor
After=xorg-server.service After=xorg.service
[Path] [Path]
PathModified=/run/openelec/debug.conf PathModified=/run/openelec/debug.conf
[Install] [Install]
WantedBy=graphical.target WantedBy=xorg.target

4
packages/x11/xserver/xorg-server/system.d/xorg-monitor.service
View File

@ -1,10 +1,10 @@
[Unit] [Unit]
Description=Xorg configfile monitor Description=Xorg configfile monitor
After=xorg-server.service After=xorg.service
[Service] [Service]
Type=oneshot Type=oneshot
ExecStart=/bin/systemctl restart xorg-server.service ExecStart=/bin/systemctl restart xorg-server.service
[Install] [Install]
WantedBy=graphical.target WantedBy=xorg.target

2
packages/x11/xserver/xorg-server/system.d/xorg-server.path → packages/x11/xserver/xorg-server/system.d/xorg.path
View File

@ -5,4 +5,4 @@ Description=Xorg server configfile watcher
PathExists=/run/openelec/xorg-settings.conf PathExists=/run/openelec/xorg-settings.conf
[Install] [Install]
WantedBy=graphical.target WantedBy=xorg.target

8
packages/x11/xserver/xorg-server/system.d/xorg-server.service → packages/x11/xserver/xorg-server/system.d/xorg.service
View File

@ -1,8 +1,9 @@
[Unit] [Unit]
Description=Xorg Server Description=Xorg Server
Conflicts=rescue.service rescue.target installer.target Conflicts=rescue.service rescue.target installer.target
Requires=graphical.target Before=xorg.target
After=multi-user.target
ConditionPathExists=/run/openelec/xorg-settings.conf
[Service] [Service]
Environment=DISPLAY=:0.0 Environment=DISPLAY=:0.0
@ -10,6 +11,7 @@ EnvironmentFile=/run/openelec/xorg-settings.conf
EnvironmentFile=-/run/openelec/debug.conf EnvironmentFile=-/run/openelec/debug.conf
ExecStart=/usr/bin/Xorg vt01 $XORG_ARGS $XORG_DEBUG ExecStart=/usr/bin/Xorg vt01 $XORG_ARGS $XORG_DEBUG
Restart=always Restart=always
# RestartSec=10
[Install] [Install]
WantedBy=graphical.target WantedBy=xorg.target

4
packages/x11/xserver/xorg-server/system.d/xorg.target Normal file
View File

@ -0,0 +1,4 @@
[Unit]
Description=The basic Xorg server
Conflicts=installer.target textmode.target rescue.target
Before=graphical.target

2
packages/x11/xserver/xorg-server/udev.d/97-xorg.rules
View File

@ -45,6 +45,6 @@ GOTO="end_video"
# configure Xorg # configure Xorg
LABEL="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" LABEL="end_video"