xbmc: merge xbmc-config.service into xbmc.service

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stefan Saraev 2014-08-13 22:05:42 +03:00 committed by Stephan Raue
parent b1608a7bca
commit 08c6eb1e7a
3 changed files with 1 additions and 13 deletions

View File

@ -505,7 +505,6 @@ post_install() {
enable_service xbmc-autostart.service enable_service xbmc-autostart.service
enable_service xbmc-cleanlogs.service enable_service xbmc-cleanlogs.service
enable_service xbmc-config.service
enable_service xbmc-hacks.service enable_service xbmc-hacks.service
enable_service xbmc-sources.service enable_service xbmc-sources.service
enable_service xbmc-halt.service enable_service xbmc-halt.service

View File

@ -1,12 +0,0 @@
[Unit]
Description=XBMC configfile writer
Before=xbmc.service
[Service]
Type=oneshot
Environment=HOME=/storage
ExecStart=/usr/lib/xbmc/xbmc-config
RemainAfterExit=yes
[Install]
WantedBy=xbmc.service

View File

@ -9,6 +9,7 @@ Environment=SDL_MOUSE_RELATIVE=0
Environment=HOME=/storage Environment=HOME=/storage
EnvironmentFile=-/run/openelec/xbmc.conf EnvironmentFile=-/run/openelec/xbmc.conf
EnvironmentFile=-/run/openelec/debug/xbmc.conf EnvironmentFile=-/run/openelec/debug/xbmc.conf
ExecStartPre=-/usr/lib/xbmc/xbmc-config
ExecStart=/bin/sh -c ". /etc/profile; exec /usr/lib/xbmc/xbmc.bin --standalone -fs $XBMC_ARGS $XBMC_DEBUG" ExecStart=/bin/sh -c ". /etc/profile; exec /usr/lib/xbmc/xbmc.bin --standalone -fs $XBMC_ARGS $XBMC_DEBUG"
# keep KillMode=process unless there is no good reason to switch to cgroup # keep KillMode=process unless there is no good reason to switch to cgroup
KillMode=process KillMode=process