[X2Go-Commits] [live-build-x2go] 32/108: exchanged HOTPLUG for RM (REMOVABLE), as lsblk in jessie doesn't understand the HOTPLUG parameter, but RM does what we want
git-admin at x2go.org
git-admin at x2go.org
Wed Mar 20 22:13:10 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 0977bee64bcbd74058e5f73cbec23d2c844950d0
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date: Fri Feb 9 00:34:22 2018 +0100
exchanged HOTPLUG for RM (REMOVABLE), as lsblk in jessie doesn't understand the HOTPLUG parameter, but RM does what we want
---
config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia | 2 +-
config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia | 2 +-
config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia
index acd6ddf..dc5ddd6 100755
--- a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia
+++ b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia
@@ -77,7 +77,7 @@ GetSSHHostKeysFromMedia ()
done
# list devices (and mountpoints, if present)
- LABELMPLIST=$(lsblk -oLABEL,NAME,MOUNTPOINT,HOTPLUG -ln)
+ LABELMPLIST=$(lsblk -oLABEL,NAME,MOUNTPOINT,RM -ln)
# search for our magic label
X2GOTCELIVELABELS=$(echo "$LABELMPLIST" | awk '$3~/^[^\/]/ && $3="" ; $1=="X2GO-TCE-LIVE" { print $2 " " $3 " " $4}')
diff --git a/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia b/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
index 4c8672e..97345d0 100755
--- a/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
+++ b/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
@@ -75,7 +75,7 @@ GetSSHClientKeysFromMedia ()
fi
# list devices (and mountpoints, if present)
- LABELMPLIST=$(lsblk -oLABEL,NAME,MOUNTPOINT,HOTPLUG -ln)
+ LABELMPLIST=$(lsblk -oLABEL,NAME,MOUNTPOINT,RM -ln)
# search for our magic label
X2GOTCELIVELABELS=$(echo "$LABELMPLIST" | awk '$3~/^[^\/]/ && $3="" ; $1=="X2GO-TCE-LIVE" { print $2 " " $3 " " $4}')
diff --git a/config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions b/config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions
index 659535e..dc45e39 100755
--- a/config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions
+++ b/config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions
@@ -46,7 +46,7 @@ X2GoGetPortableAppSessions ()
fi
# list devices (and mountpoints, if present)
- LABELMPLIST=$(lsblk -oLABEL,NAME,MOUNTPOINT,HOTPLUG -ln)
+ LABELMPLIST=$(lsblk -oLABEL,NAME,MOUNTPOINT,RM -ln)
# search for our magic label
X2GOTCELIVELABELS=$(echo "$LABELMPLIST" | awk '$3~/^[^\/]/ && $3="" ; $1=="X2GO-TCE-LIVE" { print $2 " " $3 " " $4}')
--
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