[X2Go-Commits] [live-build-x2go] 18/108: removed old debug code

git-admin at x2go.org git-admin at x2go.org
Wed Mar 20 22:13:07 CET 2019


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 2a621f0464378f325e94ca7d2305d0f55d8d16ae
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Tue Feb 6 11:48:15 2018 +0100

    removed old debug code
---
 .../includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia b/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
index 5e60ed2..2fa3ba7 100755
--- a/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
+++ b/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
@@ -44,10 +44,8 @@ GetSSHClientKeysFromMedia ()
 			PORTABLEAPPLABELS=$(awk '$3~/^[^\/]/ && $3="" ; $1=="PORTABLEAPP" { print $2 " " $3}' /var/lib/live/config/opensshkeys)
 
 			# block device list, removable first (we want USB media to be able to override keys on fixed disks)
-			BLOCKDEVLOOPCOUNT=0 # this is for debugging/logging; it seems the blockdevs list is empty on Debian stretch
 			while [ -z "$BLOCKDEVS" ] ; do
 				BLOCKDEVS=$(grep -H '' /sys/block/*/removable | awk -F':' '{ print $2 ":" $1}' | sort -r | awk -F'/' '{print $4}')
-				BLOCKDEVLOOPCOUNT=$((BLOCKDEVLOOPCOUNT+1))
 			done
 
 			check_for_config (){
@@ -118,8 +116,7 @@ GetSSHClientKeysFromMedia ()
 					fi
 				fi
 			done
-			echo "BLOCKDEVLOOPCOUNT: '$BLOCKDEVLOOPCOUNT'" > /var/lib/live/config/opensshclientkeys
-			echo "BLOCKDEVS: '$BLOCKDEVS'" >> /var/lib/live/config/opensshclientkeys
+			echo "BLOCKDEVS: '$BLOCKDEVS'" > /var/lib/live/config/opensshclientkeys
 			echo "X2GOTCELIVELABELS: '$X2GOTCELIVELABELS'" >> /var/lib/live/config/opensshclientkeys
 			echo "PORTABLEAPPLABELS: '$PORTABLEAPPLABELS'" >> /var/lib/live/config/opensshclientkeys
 		) &

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


More information about the x2go-commits mailing list