[X2Go-Commits] [live-build-x2go] 08/08: Labels with blanks need to have their blanks replaced with \x20, else the comparison with /dev/disk/by-label will fail; lsblk -r instad of lsblk -l does that.

[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 9e3f8dc870ac49b49f56121f718c0f046f3ec183
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sat Aug 22 19:45:06 2020 +0200

    Labels with blanks need to have their blanks replaced with \x20, else the comparison with /dev/disk/by-label will fail; lsblk -r instad of lsblk -l does that.
---
 config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia
index 17ad29f..a3fa000 100755
--- a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia
+++ b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia
@@ -81,7 +81,7 @@ GetSSHHostKeysFromMedia ()
 			LABELLIST=$(ls -1 /dev/disk/by-label/ | sort -u | tr '\n' '|') # generated from /dev/disk/by-label/
 			echo -n "\n$(date +'%F | %T | ')'$0' Status of /dev/disk/by-label: '$LABELLIST'." | tee -a /dev/tty8
 
-	                LABELMPLIST=$(lsblk -oLABEL,RM,NAME,MOUNTPOINT -ln)
+	                LABELMPLIST=$(lsblk -oLABEL,RM,NAME,MOUNTPOINT -rn)
 			LSBLKLIST=$(echo "$LABELMPLIST" | grep -v "^ " | awk '{print $1}' | sort -u | tr '\n' '|') # generated from lsblk
 			echo -n "\n$(date +'%F | %T | ')'$0' Status of lsblk: '$LSBLKLIST'." | tee -a /dev/tty8
 			[ "$LABELLIST" = "$LSBLKLIST" ] && break

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