restore call to kodi-standalone, fixes #26

Calling the kodi-xxx target in ExecStart= was not actually the key to
fixing the shutdown bugs in 847b6ec65. Adding the ExecStop= calling
killall to the exact target was needed.

This commit restores the call to kodi-standalone to allow the
"RestartApp" built in to work again and adds the key ExecStop= with
killall.
This commit is contained in:
graysky 2020-11-08 06:10:38 -05:00
parent 847b6ec656
commit 29b2b65590
4 changed files with 5 additions and 4 deletions

2
MIT
View File

@ -1,4 +1,4 @@
Copyright (c) 2014-2020 graysky Copyright (c) 2014-2021 graysky
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

View File

@ -12,7 +12,8 @@ SupplementaryGroups=input
PAMName=login PAMName=login
TTYPath=/dev/tty1 TTYPath=/dev/tty1
Environment=WINDOWING=gbm Environment=WINDOWING=gbm
ExecStart=/usr/lib/kodi/kodi-gbm --standalone ExecStart=/usr/bin/kodi-standalone
ExecStop=/usr/bin/killall --user kodi --exact --wait kodi-gbm
Restart=on-abort Restart=on-abort
StandardInput=tty StandardInput=tty
StandardOutput=journal StandardOutput=journal

View File

@ -11,7 +11,7 @@ EnvironmentFile=-/etc/conf.d/kodi-standalone
PAMName=login PAMName=login
TTYPath=/dev/tty1 TTYPath=/dev/tty1
Environment=WINDOWING=wayland Environment=WINDOWING=wayland
ExecStart=/usr/bin/cage -- /usr/lib/kodi/kodi-wayland --standalone ExecStart=/usr/bin/cage -- /usr/bin/kodi-standalone
ExecStop=/usr/bin/killall --user kodi --exact --wait kodi-wayland ExecStop=/usr/bin/killall --user kodi --exact --wait kodi-wayland
Restart=on-abort Restart=on-abort
StandardInput=tty StandardInput=tty

View File

@ -11,7 +11,7 @@ EnvironmentFile=-/etc/conf.d/kodi-standalone
PAMName=login PAMName=login
TTYPath=/dev/tty1 TTYPath=/dev/tty1
Environment=WINDOWING=x11 Environment=WINDOWING=x11
ExecStart=/usr/bin/xinit /usr/lib/kodi/kodi-x11 --standalone -- :0 -quiet -nolisten tcp vt1 ExecStart=/usr/bin/xinit /usr/bin/kodi-standalone -- :0 -quiet -nolisten tcp vt1
ExecStop=/usr/bin/killall --user kodi --exact --wait kodi-x11 ExecStop=/usr/bin/killall --user kodi --exact --wait kodi-x11
Restart=on-abort Restart=on-abort
StandardInput=tty StandardInput=tty