From de2af4eb20e9f77adfb1ee61e6ae3c82bfb86e92 Mon Sep 17 00:00:00 2001 From: Yaroslav Brustinov Date: Tue, 20 Dec 2016 11:01:52 +0200 Subject: Check OS version for Mellanox NICs; More detailed args error prints; 40G and Mellanox driver classes inherit from Base, not 10G. Change-Id: I55f7833078ca9d7bfcda211ad165a656ce5014c5 Signed-off-by: Yaroslav Brustinov --- scripts/trex-cfg | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'scripts/trex-cfg') diff --git a/scripts/trex-cfg b/scripts/trex-cfg index c6f12a7e..08e1110f 100755 --- a/scripts/trex-cfg +++ b/scripts/trex-cfg @@ -4,7 +4,7 @@ if [ -f /etc/debian_version ]; then OS=debian elif [ -f /etc/redhat-release ]; then OS=redhat - systemctl stop firewalld.service + systemctl stop firewalld.service &> /dev/null else OS=unknown fi @@ -78,14 +78,6 @@ fi # try to bind the ports from the configuration file (new DPDK) PARENT_ARGS="$0 $@" -if /usr/bin/python -V &> /dev/null; then - ./dpdk_setup_ports.py --parent "$PARENT_ARGS" -elif /usr/bin/python3 -V &> /dev/null; then - /usr/bin/python3 dpdk_setup_ports.py --parent "$PARENT_ARGS" -elif python -V &> /dev/null; then - python ./dpdk_setup_ports.py --parent "$PARENT_ARGS" -else - echo "Could not find python to run dpdk_setup_ports.py script" - exit 1 -fi +source find_python.sh +$PYTHON ./dpdk_setup_ports.py --parent "$PARENT_ARGS" -- cgit 1.2.3-korg