Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions smoke/_init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@ builddir=${1-}

netns_add() {
local ns="$1"
ip netns add "$ns"
nsenter -t 1 -n -m ip netns add "$ns"
cat >> $tmp/cleanup <<EOF
ip netns pids "$ns" | xargs -r kill --timeout 500 KILL
ip netns del "$ns"
nsenter -t 1 -n -m ip netns pids "$ns" | xargs -r kill --timeout 500 KILL
nsenter -t 1 -n -m ip netns del "$ns"
EOF
ip -n "$ns" link set lo up
}
Expand Down
6 changes: 3 additions & 3 deletions smoke/_init_frr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -266,14 +266,14 @@ EOF
fi
tailpid=$(pgrep -g0 tail | tail -n1)

ip netns add $namespace
nsenter -t 1 -n -m ip netns add $namespace
frrinit.sh start $namespace

cat >> $tmp/cleanup <<EOF
frrinit.sh stop $namespace
kill $tailpid
ip netns pids $namespace | xargs -r kill --timeout 500 KILL
ip netns del $namespace
nsenter -t 1 -n -m ip netns pids $namespace | xargs -r kill --timeout 500 KILL
nsenter -t 1 -n -m ip netns del $namespace
EOF

SECONDS=0
Expand Down