diff options
| author | t3sserakt <t3ss@posteo.de> | 2023-06-07 12:05:33 +0200 |
|---|---|---|
| committer | t3sserakt <t3ss@posteo.de> | 2023-06-07 12:05:33 +0200 |
| commit | ae7fcd30040c38650aa96286468dc9b0a2178d9e (patch) | |
| tree | 8279ea2770d3c60c6e4908f9e6ef7cf3fb19a367 | |
| parent | 03c4d4bee3eacf8cd938cc38f07e85a8fa68308d (diff) | |
TNG: Fixed prerequisite check in inverse DV test case script. Fixed execution of not existing script in netjail teardown script.
| -rwxr-xr-x | contrib/netjail/netjail_stop.sh | 5 | ||||
| -rwxr-xr-x | src/transport/test_transport_simple_send_dv_inverse.sh | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/contrib/netjail/netjail_stop.sh b/contrib/netjail/netjail_stop.sh index 55bcf2a5e..8f6c07f50 100755 --- a/contrib/netjail/netjail_stop.sh +++ b/contrib/netjail/netjail_stop.sh @@ -45,7 +45,10 @@ for N in $(seq $GLOBAL_N); do if [ -d /tmp/netjail_scripts ] then - ip netns exec ${ROUTERS[$N]} ./${R_SCRIPT[$N]} ${ROUTER_NETS[$N]} 0 + if [ "" != "${R_SCRIPT[$N]}" ] + then + ip netns exec ${ROUTERS[$N]} ./${R_SCRIPT[$N]} ${ROUTERS[$N]} 0 $PREFIX + fi rm -rf /tmp/netjail_scripts fi diff --git a/src/transport/test_transport_simple_send_dv_inverse.sh b/src/transport/test_transport_simple_send_dv_inverse.sh index 6a89f7397..cf7b863a0 100755 --- a/src/transport/test_transport_simple_send_dv_inverse.sh +++ b/src/transport/test_transport_simple_send_dv_inverse.sh @@ -3,7 +3,7 @@ if ! [ -d "/run/netns" ]; then echo You have to create the directory /run/netns. fi if [ -f /proc/sys/kernel/unprivileged_userns_clone ]; then - if [ "$(cat /proc/sys/kernel/unprivileged_userns_clone)" == 1 ]; then + if [ "$(cat /proc/sys/kernel/unprivileged_userns_clone)" != 1 ]; then echo -e "Error during test setup: The kernel parameter kernel.unprivileged_userns_clone has to be set to 1! One has to execute\n\n sysctl kernel.unprivileged_userns_clone=1\n" exit 78 fi |