vm_setup: Don't fail on freebsd if etc_os-release package is missing
This package is not available under latest 13.0 release, however, the /etc/os-release we are looking for is already installed there. For older versions, and in case this package is missing, we still can determine that we are running under freebsd as part of the fallback check to uname(). Signed-off-by: Michal Berger <michalx.berger@intel.com> Change-Id: I6a04eb66392d91899a4b55d4eb508bef140e924a Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7985 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
parent
15ae31fb0c
commit
022ecaa7f1
@ -11,7 +11,6 @@ install() {
|
||||
}
|
||||
|
||||
packages=(
|
||||
etc_os-release
|
||||
pciutils
|
||||
jq
|
||||
gdb
|
||||
|
@ -57,12 +57,6 @@ function error() {
|
||||
}
|
||||
|
||||
function set_os_id_version() {
|
||||
if [[ $(uname -s) == FreeBSD ]] && ! pkg info -q etc_os-release; then
|
||||
echo "Please install 'etc_os-release' package" >&2
|
||||
echo "pkg install -y etc_os-release" >&2
|
||||
exit 2
|
||||
fi
|
||||
|
||||
if [[ -f /etc/os-release ]]; then
|
||||
source /etc/os-release
|
||||
elif [[ -f /usr/local/etc/os-release ]]; then
|
||||
|
Loading…
Reference in New Issue
Block a user