[X2Go-Commits] [live-build-x2go] 05/08: persistent installations would shut down immediately on boot when .halt file was present, so we make sure to delete it and sync the disk

[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-magic-pixel-workaround-buster-heuler-bpo
in repository live-build-x2go.

commit 353681af34d3706bf353c463006480c43821e216
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Wed Aug 19 22:14:15 2020 +0200

    persistent installations would shut down immediately on boot when .halt
    file was present, so we make sure to delete it and sync the disk
---
 config/includes.chroot/lib/live/config/2800-x2go-powerbuttonmonitor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2800-x2go-powerbuttonmonitor b/config/includes.chroot/lib/live/config/2800-x2go-powerbuttonmonitor
index cb8d29c..7285918 100755
--- a/config/includes.chroot/lib/live/config/2800-x2go-powerbuttonmonitor
+++ b/config/includes.chroot/lib/live/config/2800-x2go-powerbuttonmonitor
@@ -9,9 +9,9 @@ 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'
+	POWEROFFCOMMAND='rm -f /home/user/.halt ; sync ; 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'
+	POWEROFFCOMMAND='rm -f /home/user/.halt ; sync ; poweroff'
 fi
 
 # Spawn Powerbutton-Monitor

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