mirror of
https://github.com/koreader/koreader.git
synced 2025-08-10 00:52:38 +00:00
Kobo: Unbreak KSM detection
There isn't actually a kbmenu binary, the process names are all shell scripts, kbmenu just happens to be the default folder name, so we need full commandline matching ;). Fix https://github.com/koreader/koreader/pull/9738#issuecomment-1312473323 Regression since #9738 Bump base https://github.com/koreader/koreader-base/pull/1552
This commit is contained in:
2
base
2
base
Submodule base updated: c1d97b47ab...b6bd3386aa
@@ -611,13 +611,13 @@ if [ ${RETURN_VALUE} -ne ${KO_RC_HALT} ]; then
|
||||
# if we were called from advboot then we must reboot to go to the menu
|
||||
# NOTE: This is actually achieved by checking if KSM or a KSM-related script is running:
|
||||
# This might lead to false-positives if you use neither KSM nor advboot to launch KOReader *without nickel running*.
|
||||
if ! pkill -0 kbmenu; then
|
||||
if ! pkill -0 -f kbmenu; then
|
||||
/sbin/reboot
|
||||
fi
|
||||
fi
|
||||
else
|
||||
if [ "${VIA_NICKEL}" = "false" ]; then
|
||||
if pkill -0 kbmenu; then
|
||||
if pkill -0 -f kbmenu; then
|
||||
# If we were started by KSM and requested an exit, attempt to *NOT* exit the script,
|
||||
# so as not to re-enter KSM at all, to make sure the device powers off with our own ScreenSaver displayed.
|
||||
# NOTE: This might not be fool-proof, as a poweroff might take longer than that,
|
||||
|
||||
Reference in New Issue
Block a user