From 79572d5498f8b53090d57d70bcce8575ec2fb7e4 Mon Sep 17 00:00:00 2001 From: Nick Klockenga Date: Sat, 3 Dec 2022 15:11:28 -0500 Subject: [PATCH 1/3] fix ressart/poweroff functions for debian based os, broke when making changes for seedsigner-os --- src/seedsigner/views/view.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/seedsigner/views/view.py b/src/seedsigner/views/view.py index 41199df5..63c35cdb 100644 --- a/src/seedsigner/views/view.py +++ b/src/seedsigner/views/view.py @@ -5,7 +5,7 @@ from seedsigner.gui.components import FontAwesomeIconConstants, GUIConstants from seedsigner.gui.screens import RET_CODE__POWER_BUTTON from seedsigner.gui.screens.screen import RET_CODE__BACK_BUTTON, DireWarningScreen, LargeButtonScreen, PowerOffScreen, ResetScreen, WarningScreen from seedsigner.models.threads import BaseThread - +from seedsigner.models import Settings class BackStackView: @@ -190,7 +190,10 @@ class RestartView(View): # Kill the SeedSigner process; Running the process again. # `.*` is a wildcard to detect either `python`` or `python3`. - call("kill $(pidof python*) & python /opt/src/main.py", shell=True) + if Settings.HOSTNAME == Settings.SEEDSIGNER_OS: + call("kill $(pidof python*) & python /opt/src/main.py", shell=True) + else: + call("kill $(ps aux | grep '[p]ython.*main.py' | awk '{print $2}')", shell=True) @@ -207,7 +210,10 @@ class PowerOffView(View): from subprocess import call while self.keep_running: time.sleep(5) - call("poweroff", shell=True) + if Settings.HOSTNAME == Settings.SEEDSIGNER_OS: + call("poweroff", shell=True) + else: + call("sudo shutdown --poweroff now", shell=True) From b881538c511ea56ea9d95fc732f191fe4c9f8a46 Mon Sep 17 00:00:00 2001 From: Nick Klockenga Date: Sat, 3 Dec 2022 17:58:06 -0500 Subject: [PATCH 2/3] disable microsd detection prior to shutdown to prevent display of toast notification --- src/seedsigner/views/view.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/seedsigner/views/view.py b/src/seedsigner/views/view.py index 63c35cdb..98e64cb8 100644 --- a/src/seedsigner/views/view.py +++ b/src/seedsigner/views/view.py @@ -211,6 +211,8 @@ class PowerOffView(View): while self.keep_running: time.sleep(5) if Settings.HOSTNAME == Settings.SEEDSIGNER_OS: + # disable microsd detection before shutdown to prevent display of toast notification during shutdown + self.controller.microsd.stop() call("poweroff", shell=True) else: call("sudo shutdown --poweroff now", shell=True) From 3920199f9d39f3838a020e9b3777b4f687966fe5 Mon Sep 17 00:00:00 2001 From: Nick Klockenga Date: Sat, 3 Dec 2022 22:24:06 -0500 Subject: [PATCH 3/3] correct reference to controller to stop microsd detection thread --- src/seedsigner/views/view.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/seedsigner/views/view.py b/src/seedsigner/views/view.py index 98e64cb8..50b1c40a 100644 --- a/src/seedsigner/views/view.py +++ b/src/seedsigner/views/view.py @@ -212,7 +212,8 @@ class PowerOffView(View): time.sleep(5) if Settings.HOSTNAME == Settings.SEEDSIGNER_OS: # disable microsd detection before shutdown to prevent display of toast notification during shutdown - self.controller.microsd.stop() + from seedsigner.controller import Controller + Controller.get_instance().microsd.stop() call("poweroff", shell=True) else: call("sudo shutdown --poweroff now", shell=True)