From 47a87a0eb65130b0ec42828144ffb80ba4b326ff Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Wed, 16 Sep 2020 10:30:13 +0200 Subject: [PATCH] config/vm_setup: Don't fail on FreeBSD when os-release file is missing Instead, define $ID, $VERSION_ID on our own based on FreeBSD's version we are running on - 69d5d77bfb added etc_os-release package as a pkg dependency so this change makes sure we have a chance to actually install it. Change-Id: I09b350ce3ae3f7c5d2f998f3d251f50e1277f846 Signed-off-by: Michal Berger Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4261 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki --- test/common/config/vm_setup.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/common/config/vm_setup.sh b/test/common/config/vm_setup.sh index 0dcac3e0a..8c87f9b98 100755 --- a/test/common/config/vm_setup.sh +++ b/test/common/config/vm_setup.sh @@ -68,6 +68,10 @@ function set_os_id_version() { elif [[ -f /usr/local/etc/os-release ]]; then # On FreeBSD file is located under /usr/local if etc_os-release package is installed source /usr/local/etc/os-release + elif [[ $(uname -s) == FreeBSD ]]; then + ID=freebsd + VERSION_ID=$(freebsd-version) + VERSION_ID=${VERSION_ID//.*/} else echo "File os-release not found" >&2 exit 3