Merge pull request #5809 from janekmi/testconfig-generation-fix

common: fix ndctl & jq detection for testconfig generation
pmem · Jul 20, 2023 · fafc805 · fafc805
2 parents 1d3aa68 + 3a81a3d
commit fafc805
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/utils/create-testconfig.sh b/utils/create-testconfig.sh
@@ -59,7 +59,7 @@ TM=1
 # lookup all Device DAX devices in the system
 DEVICE_DAX_PATH=
 device_dax_path=
-if [ `which ndctl` -a `which jq` ]; then
+if which ndctl > /dev/null 2>&1 && which jq > /dev/null 2>&1; then
  DEVICE_DAX_PATH="$(ndctl list -X | jq -r '.[].daxregion.devices[].chardev' | awk '$0="/dev/"$0' | paste -sd' ')"
  device_dax_path="$(ndctl list -X | jq -r '.[].daxregion.devices[].chardev' | awk '$0="'\''/dev/"$0"'\''"' | paste -sd',')"
 fi