[X2Go-Commits] [live-build-x2go] 154/167: added "finished" marker

git-admin at x2go.org git-admin at x2go.org
Sat Nov 18 00:33:03 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 d7bdc27533d8a9d589fd0e92c0bd9a2c45c28125
Author: Stefan Baur <kontakt at baur-itcs.de>
Date:   Tue Nov 7 20:34:51 2017 +0100

    added "finished" marker
---
 .../lib/live/config/2260-getsshhostkeysfrommedia             | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia
index 553ea3b..b96f0aa 100755
--- a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia
+++ b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia
@@ -85,14 +85,21 @@ GetSSHHostKeysFromMedia ()
 
 				if [ -n "$MNTPT" ] ; then
 					echo -n "\n$(date +'%F | %T | ')'$0' Device '$NEXTDEVICE' is mounted at: '$MNTPT'" | tee -a /dev/tty8
-					check_for_config $MNTPT && exit 0
+					if check_for_config $MNTPT ; then
+						touch /var/lib/live/config/opensshkeys
+						exit 0
+					fi
 				else
 					echo -n "\n$(date +'%F | %T | ')'$0' Device '$NEXTDEVICE' is not mounted." | tee -a /dev/tty8
 					if grep -q "^0$" /sys/block/*/removable ; then
 					echo -n "\n$(date +'%F | %T | ')'$0' Device '$NEXTDEVICE' is a fixed disk, mounting ..." | tee -a /dev/tty8
 						mkdir -p /media/fixeddisks/$NEXTDEVICE
 						mount -o ro /dev/$NEXTDEVICE /media/fixeddisks/$NEXTDEVICE
-						check_for_config /media/fixeddisks/$NEXTDEVICE && umount /media/fixeddisks/$NEXTDEVICE && exit 0
+						if check_for_config /media/fixeddisks/$NEXTDEVICE ; then
+							umount /media/fixeddisks/$NEXTDEVICE
+							touch /var/lib/live/config/opensshkeys
+							exit 0
+						fi
 						umount /media/fixeddisks/$NEXTDEVICE
 					else
 						echo -n "\n$(date +'%F | %T | ')'$0' Device '$NEXTDEVICE' is a removable disk, not mounted by automounter, skipping." | tee -a /dev/tty8
@@ -101,6 +108,7 @@ GetSSHHostKeysFromMedia ()
 				fi
 			fi
 		done
+		touch /var/lib/live/config/opensshkeys
 	) &
 }
 

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