From 29b2b65590e6b0a9ec290ef8015488e584b78748 Mon Sep 17 00:00:00 2001 From: graysky Date: Sun, 8 Nov 2020 06:10:38 -0500 Subject: [PATCH] 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. --- MIT | 2 +- init/kodi-gbm.service | 3 ++- init/kodi-wayland.service | 2 +- init/kodi-x11.service | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/MIT b/MIT index 320b71e..e9e878b 100644 --- a/MIT +++ b/MIT @@ -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: diff --git a/init/kodi-gbm.service b/init/kodi-gbm.service index 45778a4..eb6e81d 100644 --- a/init/kodi-gbm.service +++ b/init/kodi-gbm.service @@ -12,7 +12,8 @@ SupplementaryGroups=input PAMName=login TTYPath=/dev/tty1 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 StandardInput=tty StandardOutput=journal diff --git a/init/kodi-wayland.service b/init/kodi-wayland.service index e05a50c..091fe89 100644 --- a/init/kodi-wayland.service +++ b/init/kodi-wayland.service @@ -11,7 +11,7 @@ EnvironmentFile=-/etc/conf.d/kodi-standalone PAMName=login TTYPath=/dev/tty1 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 Restart=on-abort StandardInput=tty diff --git a/init/kodi-x11.service b/init/kodi-x11.service index 877929b..26774ab 100644 --- a/init/kodi-x11.service +++ b/init/kodi-x11.service @@ -11,7 +11,7 @@ EnvironmentFile=-/etc/conf.d/kodi-standalone PAMName=login TTYPath=/dev/tty1 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 Restart=on-abort StandardInput=tty