diff options
| author | Simon Rettberg | 2016-01-12 15:20:30 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2016-01-12 15:20:30 +0100 |
| commit | 16f9e3d9965fad6970b8a7327b66a591a07dc4c5 (patch) | |
| tree | a92191bc99ff2f004564cf814e2c7d4f4978d8fa | |
| parent | Touch /etc/cron.d after adding/modifying files, so cron will rescan the dir (diff) | |
| download | tm-scripts-16f9e3d9965fad6970b8a7327b66a591a07dc4c5.tar.gz tm-scripts-16f9e3d9965fad6970b8a7327b66a591a07dc4c5.tar.xz tm-scripts-16f9e3d9965fad6970b8a7327b66a591a07dc4c5.zip | |
[idleaction] Use proper shutdown and reboot
This has been working reliably for a while now
3 files changed, 3 insertions, 3 deletions
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 |