[X2Go-Commits] [live-build-x2go] 42/108: for various reasons (especially fuseext2 misbehaving occasionally and eating up 100% CPU), it makes more sense to check the volume(s) with the PORTABLEAPP label first

[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 3ef64edb89890d3658ee0a20f443af735449788b
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Mon Feb 12 01:03:45 2018 +0100

    for various reasons (especially fuseext2 misbehaving occasionally and eating up 100% CPU), it makes more sense to check the volume(s) with the PORTABLEAPP label first
---
 config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia   | 2 +-
 config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia b/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
index 09b4054..66c4fb4 100755
--- a/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
+++ b/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
@@ -84,7 +84,7 @@ GetSSHClientKeysFromMedia ()
 			PORTABLEAPPLABELS=$(echo "$LABELMPLIST" | awk '$1 == "PORTABLEAPP" { print $2 " " $3 " " $4}')
 
 			# block device list, removable first (we want USB media to be able to override keys on fixed disks)
-			BLOCKDEVS="$(echo "$X2GOTCELIVELABELS\n$PORTABLEAPPLABELS" | awk '$1 == "1" {print $2}') $(echo "$X2GOTCELIVELABELS\n$PORTABLEAPPLABELS" | awk '$1 == "0" {print $2}')"
+			BLOCKDEVS="$(echo "$PORTABLEAPPLABELS\n$X2GOTCELIVELABELS" | awk '$1 == "1" {print $2}') $(echo "$PORTABLEAPPLABELS\n$X2GOTCELIVELABELS" | awk '$1 == "0" {print $2}')"
 
 			# for every block device in our list, do ...
 			for BLOCKDEV in $BLOCKDEVS; do 
diff --git a/config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions b/config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions
index a1a97a5..9d4db41 100755
--- a/config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions
+++ b/config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions
@@ -65,7 +65,7 @@ X2GoGetPortableAppSessions ()
 		PORTABLEAPPLABELS=$(echo "$LABELMPLIST" | awk '$1 == "PORTABLEAPP" { print $2 " " $3 " " $4}')
 
 		# block device list, removable first (we want USB media to be able to override configs on fixed disks)
-		BLOCKDEVS="$(echo "$X2GOTCELIVELABELS\n$PORTABLEAPPLABELS" | awk '$1 == "1" {print $2}') $(echo "$X2GOTCELIVELABELS\n$PORTABLEAPPLABELS" | awk '$1 == "0" {print $2}')"
+		BLOCKDEVS="$(echo "$PORTABLEAPPLABELS\n$X2GOTCELIVELABELS" | awk '$1 == "1" {print $2}') $(echo "$PORTABLEAPPLABELS\n$X2GOTCELIVELABELS" | awk '$1 == "0" {print $2}')"
 
 		# for every block device in our list, do ...
 		for BLOCKDEV in $BLOCKDEVS; do 

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