diff options
| author | Christian Franke <chris@opensourcerouting.org> | 2018-12-06 18:31:34 +0100 |
|---|---|---|
| committer | Christian Franke <chris@opensourcerouting.org> | 2018-12-06 18:33:21 +0100 |
| commit | 464e85c84d27758e4179e40737025fe9a905c195 (patch) | |
| tree | feb9f3b992e57f28cef8c9ef135289122d0136e8 /tests | |
| parent | Merge pull request #3419 from opensourcerouting/freebsd-route-warning-fix (diff) | |
| download | frr-464e85c84d27758e4179e40737025fe9a905c195.tar.xz frr-464e85c84d27758e4179e40737025fe9a905c195.zip | |
tests/topotests: Also search sbin for modprobe
We call `modprobe -n` to check if mpls modules are available to be
loaded. We do this as normal user, to only ask for root permissions
if we are actually loading the module.
This breaks if `modprobe` is in `/sbin` and normal users don't have
sbin in path.
So add `/sbin` to the search path to work around this.
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/topotests/docker/frr-topotests.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/topotests/docker/frr-topotests.sh b/tests/topotests/docker/frr-topotests.sh index 673354f5d..c13262652 100755 --- a/tests/topotests/docker/frr-topotests.sh +++ b/tests/topotests/docker/frr-topotests.sh @@ -80,6 +80,8 @@ fi # them from the host however, they can be used just fine. # +export PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin" + for module in mpls-router mpls-iptunnel; do if modprobe -n $module 2> /dev/null; then : |