[X2Go-Commits] [live-build-x2go] 09/108: removable device detection was broken
git-admin at x2go.org
git-admin at x2go.org
Wed Mar 20 22:13:03 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 93322eb0f300626bef4c2130ec68537650603baf
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date: Sun Feb 4 13:03:04 2018 +0100
removable device detection was broken
---
config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia | 2 +-
config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia
index 636a145..8f2add2 100755
--- a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia
+++ b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia
@@ -98,7 +98,7 @@ GetSSHHostKeysFromMedia ()
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
+ if grep -q "^0$" /sys/block/$BLOCKDEV/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
diff --git a/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia b/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
index 8def2b4..5e60ed2 100755
--- a/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
+++ b/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
@@ -101,7 +101,7 @@ GetSSHClientKeysFromMedia ()
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
+ if grep -q "^0$" /sys/block/$BLOCKDEV/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
--
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