From 16f9e3d9965fad6970b8a7327b66a591a07dc4c5 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 12 Jan 2016 15:20:30 +0100
Subject: [idleaction] Use proper shutdown and reboot

This has been working reliably for a while now
---
 .../modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script  | 2 +-
 .../idleaction/data/opt/openslx/scripts/idleaction-scheduled_poweroff   | 2 +-
 .../idleaction/data/opt/openslx/scripts/idleaction-scheduled_reboot     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'remote/modules')

diff --git a/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script b/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script
index 100bce82..b0e67e4f 100755
--- a/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script
+++ b/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script
@@ -95,7 +95,7 @@ if [ -n "${SLX_SHUTDOWN_TIMEOUT}" ] && [ "${SLX_SHUTDOWN_TIMEOUT}" -gt 0 ] && [
 	[ "$IDLE" -gt "$NOW" ] && IDLE="$NOW"
 	IDLE=$(( $NOW - $IDLE ))
 	if [ "$IDLE" -gt "$SLX_SHUTDOWN_TIMEOUT" ]; then
-		poweroff -nf # TODO: Do proper shutdown once it works reliably
+		poweroff
 	fi
 fi
 
diff --git a/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_poweroff b/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_poweroff
index 5b5acda2..742189db 100755
--- a/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_poweroff
+++ b/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_poweroff
@@ -2,5 +2,5 @@
 
 # TODO: Warn user, wait 5 minutes, etc...
 
-poweroff -nf
+poweroff
 
diff --git a/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_reboot b/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_reboot
index fa3adf65..6c13601f 100755
--- a/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_reboot
+++ b/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_reboot
@@ -2,5 +2,5 @@
 
 # TODO: Warn user, wait 5 minutes, etc...
 
-echo 'b' > /proc/sysrq-trigger
+reboot
 
-- 
cgit v1.2.3-55-g7522