[X2Go-Commits] [live-build-x2go] 34/108: lsblk output is parsed again later on, which means that this later code block needed to be changed as well, so it understands the new output order (Removable/Fixed Disk on 2nd, rather than 4th position)

[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 7ef5b46bb9e40c10db56fccbf4d723479868eb47
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sat Feb 10 14:14:57 2018 +0100

    lsblk output is parsed again later on, which means that this later code block needed to be changed as well, so it understands the new output order (Removable/Fixed Disk on 2nd, rather than 4th position)
---
 config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia | 6 +++---
 .../includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia  | 6 +++---
 .../lib/live/config/2280-x2go-getportableappsessions                | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia
index d7f1071..3f047ab 100755
--- a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia
+++ b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia
@@ -92,9 +92,9 @@ GetSSHHostKeysFromMedia ()
 			NEXTDEVICE=$(echo "$X2GOTCELIVELABELS" | grep "$BLOCKDEV")
 			if [ -n "$NEXTDEVICE" ] ; then
 				# now figure out the mountpoint
-				MNTPT=$(echo $NEXTDEVICE | awk '{print $2}')
-				# and the device name? Wait, this is the magic label instead.
-				NEXTDEVICE=$(echo $NEXTDEVICE | awk '{print $1}')
+				MNTPT=$(echo $NEXTDEVICE | awk '{print $3}')
+				# and the device name
+				NEXTDEVICE=$(echo $NEXTDEVICE | awk '{print $2}')
 
 				if [ -n "$MNTPT" ] ; then
 					# If the mountpoint variable isn't empty, it means the device is already mounted.
diff --git a/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia b/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
index 0170290..6be457c 100755
--- a/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
+++ b/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
@@ -93,9 +93,9 @@ GetSSHClientKeysFromMedia ()
 				NEXTDEVICE=$(echo "$X2GOTCELIVELABELS\n$PORTABLEAPPLABELS" | grep "$BLOCKDEV")
 				if [ -n "$NEXTDEVICE" ] ; then
 					# now figure out the mountpoint
-					MNTPT=$(echo $NEXTDEVICE | awk '{print $2}')
-					# and the device name? Wait, this is the magic label instead.
-					NEXTDEVICE=$(echo $NEXTDEVICE | awk '{print $1}')
+					MNTPT=$(echo $NEXTDEVICE | awk '{print $3}')
+					# and the device name
+					NEXTDEVICE=$(echo $NEXTDEVICE | awk '{print $2}')
 					echo -n "\n$(date +'%F | %T | ')'$0' Checking status of Device '$NEXTDEVICE' for BLOCKDEV '$BLOCKDEV'." | tee -a /dev/tty8
 					if [ -n "$MNTPT" ] ; then
 						# If the mountpoint variable isn't empty, it means the device is already mounted.
diff --git a/config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions b/config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions
index 61dee77..57d6f05 100755
--- a/config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions
+++ b/config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions
@@ -64,9 +64,9 @@ X2GoGetPortableAppSessions ()
 			NEXTDEVICE=$(echo "$X2GOTCELIVELABELS\n$PORTABLEAPPLABELS" | grep "$BLOCKDEV")
 			if [ -n "$NEXTDEVICE" ] ; then
 				# now figure out the mountpoint
-				MNTPT=$(echo $NEXTDEVICE | awk '{print $2}')
-				# and the device name? Wait, this is the magic label instead.
-				NEXTDEVICE=$(echo $NEXTDEVICE | awk '{print $1}')
+				MNTPT=$(echo $NEXTDEVICE | awk '{print $3}')
+				# and the device name
+				NEXTDEVICE=$(echo $NEXTDEVICE | awk '{print $2}')
 				echo -n "\n$(date +'%F | %T | ')'$0' Checking status of Device '$NEXTDEVICE' for BLOCKDEV '$BLOCKDEV'." | tee -a /dev/tty8
 				if [ -n "$MNTPT" ] ; then
 					# If the mountpoint variable isn't empty, it means the device is already mounted.

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