ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vm_setup: Check for btrfs-progs on apt-get based systems

Browse Source 
Currently, Ubuntu 20.04 exposes btrfs-tools under different name,
btrfs-progs. Be nice and fallback to that package name if btrfs-tools
installation fails.

Change-Id: I78d51b081069b252c59b13d2347cdd077938131a
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2671
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Michal Berger 2020-05-28 14:51:14 +02:00 committed by Tomasz Zawadzki
parent 6f5b39115d
commit a15eef8b03
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/common/config/vm_setup.sh
View File

@ -620,6 +620,11 @@ if $INSTALL; then
sudo apt-get install -y targetcli sudo apt-get install -y targetcli
fi fi
# On Ubuntu 20.04 (focal) btrfs-tools are available under different name - btrfs-progs
if ! sudo apt-get install -y btrfs-tools; then
sudo apt-get install -y btrfs-progs
fi
sudo apt-get install -y \ sudo apt-get install -y \
valgrind \ valgrind \
jq \ jq \
@ -648,7 +653,6 @@ if $INSTALL; then
sshfs \ sshfs \
sshpass \ sshpass \
python3-pandas \ python3-pandas \
btrfs-tools \
bc \ bc \
smartmontools \ smartmontools \
wget wget