[X2Go-Commits] [live-build-x2go] 92/160: logfile will now also contain which environment is the running one

git-admin at x2go.org git-admin at x2go.org
Sat Nov 18 01:55:47 CET 2017


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 a251b88ae36db0dd24a2dbc06650cd76b3e09eaa
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Tue Jul 25 17:52:17 2017 +0200

    logfile will now also contain which environment is the running one
---
 .../lib/live/config/2400-live-autoupdate                | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2400-live-autoupdate b/config/includes.chroot/lib/live/config/2400-live-autoupdate
index cc33e7b..ae16e48 100755
--- a/config/includes.chroot/lib/live/config/2400-live-autoupdate
+++ b/config/includes.chroot/lib/live/config/2400-live-autoupdate
@@ -9,9 +9,10 @@ show_versions ()
 		echo -n "\n$(date +'%F | %T | ')'$0': List of locally stored TCE versions:"
 		echo "--- BEGIN TIMESTAMPS ---" >/var/run/x2go-tce-timestamps
 		for TIMESTAMPFILE in $LISTOFTIMESTAMPFILES; do 
-			echo "$(basename $(dirname $TIMESTAMPFILE));$(cat $TIMESTAMPFILE);" >>/var/run/x2go-tce-timestamps
+			echo ";;$(basename $(dirname $TIMESTAMPFILE));$(cat $TIMESTAMPFILE);" >>/var/run/x2go-tce-timestamps
 			echo -n "\n$(date +'%F | %T | ')'$0': $(basename $(dirname $TIMESTAMPFILE)) $(cat $TIMESTAMPFILE) - $(date --date=@$(cat $TIMESTAMPFILE))"
 		done
+		sed -i "s/;$RUNNINGSYSTEMNAME/X;$RUNNINGSYSTEMNAME/i" /var/run/x2go-tce-timestamps
 		echo "---- END TIMESTAMPS ----" >>/var/run/x2go-tce-timestamps
 	fi
 }
@@ -87,6 +88,14 @@ echo -n " live-autoupdater (backgrounding update task)"
 	unset LC_MESSAGES
 
 
+	# determine our booted environment as well as the other available ones
+	RUNNINGSYSTEMFULLPATH=$(dirname $(readlink -m "$MOUNTPOINT/$(cat /proc/cmdline | \
+				tr ' ' '\n' | \
+				awk -F'=' ' /^findiso=/ { print $2 }')"))
+
+	ALLSYSTEMSROOT=$(dirname $RUNNINGSYSTEMFULLPATH)
+	RUNNINGSYSTEMNAME=$(basename $RUNNINGSYSTEMFULLPATH)
+
 	# download url pointing to directory with all required files goes here
 	DOWNLOADURL=$(cat /proc/cmdline | \
 		       tr ' ' '\n' | \
@@ -235,12 +244,6 @@ echo -n " live-autoupdater (backgrounding update task)"
 		return 1
 	fi
 
-	RUNNINGSYSTEMFULLPATH=$(dirname $(readlink -m "$MOUNTPOINT/$(cat /proc/cmdline | \
-				tr ' ' '\n' | \
-				awk -F'=' ' /^findiso=/ { print $2 }')"))
-
-	ALLSYSTEMSROOT=$(dirname $RUNNINGSYSTEMFULLPATH)
-	RUNNINGSYSTEMNAME=$(basename $RUNNINGSYSTEMFULLPATH)
 	if [ "$RUNNINGSYSTEMNAME" = "X2Go-live1" ]; then
 		OTHERSYSTEMNAME="X2Go-live2"
 	elif [ "$RUNNINGSYSTEMNAME" = "X2Go-live2" ]; then

--
Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git


More information about the x2go-commits mailing list