[X2Go-Commits] [live-build-x2go] 69/167: improved logging, added error detection for mount process

git-admin at x2go.org git-admin at x2go.org
Sat Nov 18 00:32:44 CET 2017


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

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

commit b50808feb4dd22178c6a8ceb81c63e9c8cdd412e
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Mon Jul 24 14:28:25 2017 +0200

    improved logging, added error detection for mount process
---
 config/includes.chroot/lib/live/config/2400-live-autoupdate | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2400-live-autoupdate b/config/includes.chroot/lib/live/config/2400-live-autoupdate
index 94128ca..94e2657 100755
--- a/config/includes.chroot/lib/live/config/2400-live-autoupdate
+++ b/config/includes.chroot/lib/live/config/2400-live-autoupdate
@@ -63,6 +63,7 @@ echo -n " live-autoupdater (backgrounding update task)"
 	fi
 
 	if ! [ -d /lib/live/mount/findiso ] ; then
+		echo "\n$(date +'%F | %T | ')'$0': '/lib/live/mount/findiso' directory not found. Scanning for partitions."
 		LISTOFPARTITIONS=$(grep -H ^0$ /sys/block/*/removable | awk -F '/' '{ print $4 }' | xargs -n 1 -I XXX fdisk -l /dev/XXX 2>/dev/null | awk '$0 ~ /Linux$/ { print $1}')
 		TEMPMOUNT=$(mktemp -d -p /lib/live/mount/)
 		FINDFILE=$(cat /proc/cmdline | tr " " "\n" | awk -F '=' '$1 == "findiso" { print $2 }')
@@ -73,9 +74,14 @@ echo -n " live-autoupdater (backgrounding update task)"
 				umount $TEMPMOUNT
 			else
 				umount $TEMPMOUNT
+				rmdir $TEMPMOUNT
 				mkdir /lib/live/mount/findiso
-				mount $PARTITION /lib/live/mount/findiso
-				RAMDISKMODE="yes"
+				if mount $PARTITION /lib/live/mount/findiso ; then
+					echo "\n$(date +'%F | %T | ')'$0': mounted $PARTITION as '/lib/live/mount/findiso'."
+					RAMDISKMODE="yes"
+				else
+					echo "\n$(date +'%F | %T | ')'$0': error mounting $PARTITION as '/lib/live/mount/findiso'."
+				fi
 				break
 			fi
 		done

--
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