[X2Go-Commits] [live-build-x2go] 103/108: added new feature for faster shutdown in non-minidesktop mode

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/openbox
in repository live-build-x2go.

commit 5c51ed6facab395d682c0f63ac9966f487c6085c
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Wed Feb 6 22:19:21 2019 +0000

    added new feature for faster shutdown in non-minidesktop mode
---
 .../lib/live/config/2800-x2go-powerbuttonmonitor               | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/config/includes.chroot/lib/live/config/2800-x2go-powerbuttonmonitor b/config/includes.chroot/lib/live/config/2800-x2go-powerbuttonmonitor
index 8f21eaf..4ec3a95 100755
--- a/config/includes.chroot/lib/live/config/2800-x2go-powerbuttonmonitor
+++ b/config/includes.chroot/lib/live/config/2800-x2go-powerbuttonmonitor
@@ -6,8 +6,16 @@ X2GoPowerbuttonMonitor ()
 #
 echo -n " x2go-powerbuttonmonitor"
 
+# determine poweroff-command
+if grep -q "\W*fastpo\W*" /proc/cmdline && ! [ -d ~x2gothinclient ] ; then 
+	# this does not make sense for the minidesktop
+	POWEROFFCOMMAND='while ! (grep "^/dev/" /etc/mtab | grep -q rw ) ; do echo s >/proc/sysrq-trigger ; echo u >/proc/sysrq-trigger ; done ; echo o >/proc/sysrq-trigger'
+else
+	POWEROFFCOMMAND='poweroff'
+fi
+
 # Spawn Powerbutton-Monitor
-/bin/bash -c '(while ! [ -f /home/user/.halt ] ; do sleep 1 ; done ; poweroff ; chvt 7) &'
+/bin/bash -c '(while ! [ -f /home/user/.halt ] ; do sleep 1 ; done ; $POWEROFFCOMMAND ; chvt 7) &'
 }
 
 X2GoPowerbuttonMonitor

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git