From 6c1681b595911a488bfdbcdc23f5cab2aca33fff Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Sun, 26 Apr 2015 22:46:16 +0200 Subject: [PATCH] Well, go for the lesser evil. For some unknowable reason, restarting nickel on exit deadlocks on my H2O, so, do a full reboot instead, at least *that* works. I'm probably one of the only people running KO manually anyway... --- platform/kobo/koreader.sh | 9 +++++++-- platform/kobo/nickel.sh | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/platform/kobo/koreader.sh b/platform/kobo/koreader.sh index 78f34fe32..fe4d51468 100755 --- a/platform/kobo/koreader.sh +++ b/platform/kobo/koreader.sh @@ -71,8 +71,13 @@ fi ./reader.lua "${args}" 2> crash.log if [ "${from_nickel}" == "true" ] ; then - # start kobo software because was running before koreader - ./nickel.sh & + # start kobo software because it was running before koreader + #./nickel.sh & + + # FIXME: This appears to be horribly broken: nickel restarts, but deadlocks instantly (requiring a paperclip to reset...). + # So, eff it, and just reboot instead, that barely takes more time anyway. + # NOTE: H2O, 3.13.1 + reboot else # if we were called from advboot then we must reboot to go to the menu if ! pkill -0 ksmhome.sh ; then diff --git a/platform/kobo/nickel.sh b/platform/kobo/nickel.sh index 8d92bb449..d520c28c5 100644 --- a/platform/kobo/nickel.sh +++ b/platform/kobo/nickel.sh @@ -29,7 +29,8 @@ export LANG="en_US.UTF-8" # cover all firmware versions from 2.6.1 to 3.4.1 (tested on a kobo # mini with 3.4.1 firmware) -( /usr/local/Kobo/pickel disable.rtc.alarm +( + /usr/local/Kobo/pickel disable.rtc.alarm if [ ! -e "/etc/wpa_supplicant/wpa_supplicant.conf" ] ; then cp "/etc/wpa_supplicant/wpa_supplicant.conf.template" "/etc/wpa_supplicant/wpa_supplicant.conf" fi