Merge branch 'jb46072_ignore_alarms_on_shutdown' into 'master'

Ignore imminent alarms on shutdown when home is encrypted See merge request mer-core/dsme!31
sailfishos · Jun 12, 2019 · ba0d02a · ba0d02a
2 parents 5dd2347 + 1a3db09
commit ba0d02a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.depend b/.depend
@@ -481,6 +481,7 @@ modules/startup.pic.o:\
 modules/state.o:\
 	modules/state.c\
 	dsme/dsme-rd-mode.h\
+	dsme/utility.h\
 	include/dsme/logging.h\
 	include/dsme/modulebase.h\
 	include/dsme/modules.h\
@@ -496,6 +497,7 @@ modules/state.o:\
 modules/state.pic.o:\
 	modules/state.c\
 	dsme/dsme-rd-mode.h\
+	dsme/utility.h\
 	include/dsme/logging.h\
 	include/dsme/modulebase.h\
 	include/dsme/modules.h\

diff --git a/modules/state.c b/modules/state.c
@@ -48,6 +48,7 @@
 #include <dsme/state.h>
 
 #include "../dsme/dsme-rd-mode.h"
+#include "../dsme/utility.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -365,9 +366,12 @@ static dsme_state_t select_state(void)
           /* favor normal shutdown over reboot over actdead */
           if (shutdown_requested &&
               (charger_state == CHARGER_DISCONNECTED) &&
-              !alarm_set)
+              (!alarm_set || dsme_home_is_encrypted()))
           {
-              dsme_log(LOG_NOTICE, PFIX"Normal shutdown");
+              dsme_log(LOG_NOTICE, PFIX"Normal shutdown%s",
+                       alarm_set
+                       ? " (alarm set, but ignored due to encrypted home)"
+                       : "");
               state = DSME_STATE_SHUTDOWN;
           } else if (reboot_requested) {
               dsme_log(LOG_NOTICE, PFIX"Reboot");