lagertonne/ifupdown-ng
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Wiki Activity

Merge pull request #41 from ifupdown-ng/bugfix/link-back-to-up-down

Browse source 
Bugfix/link back to up down
This commit is contained in:
Ariadne Conill 2020-08-25 08:19:13 -06:00 committed by GitHub
commit b30f84fdbd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
executor-scripts/linux/link
View file

@ -29,14 +29,12 @@ is_vlan() {
} }
case "$PHASE" in case "$PHASE" in
pre-up|post-down) up|down)
UP_DOWN="${PHASE##*-}"
if is_vlan; then if is_vlan; then
ADD_DEL="add" ADD_DEL="add"
[ "$UP_DOWN" = "down" ] && ADD_DEL="delete" [ "$PHASE" = "down" ] && ADD_DEL="delete"
if [ "$UP_DOWN" = "up" -a -e /sys/class/net/$IFACE ]; then if [ "$PHASE" = "up" -a -e /sys/class/net/$IFACE ]; then
exit 0 exit 0
fi fi
@ -53,11 +51,11 @@ pre-up|post-down)
fi fi
${MOCK} ip link $ADD_DEL link "$IF_VLAN_RAW_DEVICE" name "$IFACE" type vlan id "$IF_VLAN_ID" ${MOCK} ip link $ADD_DEL link "$IF_VLAN_RAW_DEVICE" name "$IFACE" type vlan id "$IF_VLAN_ID"
[ "$UP_DOWN" = "down" ] && exit 0 [ "$PHASE" = "down" ] && exit 0
${MOCK} ip link set $UP_DOWN dev $IFACE $IF_LINK_OPTIONS ${MOCK} ip link set $PHASE dev $IFACE $IF_LINK_OPTIONS
else else
${MOCK} ip link set $UP_DOWN dev $IFACE $IF_LINK_OPTIONS ${MOCK} ip link set $PHASE dev $IFACE $IF_LINK_OPTIONS
fi fi
;; ;;
depend) depend)

16
tests/linux/link_test
View file

@ -15,51 +15,51 @@ tests_init \
vlan_guessed_depend vlan_guessed_depend
up_body() { up_body() {
export IFACE=lo PHASE=pre-up MOCK=echo export IFACE=lo PHASE=up MOCK=echo
atf_check -s exit:0 -o match:'ip link set up dev lo' \ atf_check -s exit:0 -o match:'ip link set up dev lo' \
${EXECUTOR} ${EXECUTOR}
} }
down_body() { down_body() {
export IFACE=lo PHASE=post-down MOCK=echo export IFACE=lo PHASE=down MOCK=echo
atf_check -s exit:0 -o match:'ip link set down dev lo' \ atf_check -s exit:0 -o match:'ip link set down dev lo' \
${EXECUTOR} ${EXECUTOR}
} }
mtu_body() { mtu_body() {
export IFACE=eth0 PHASE=pre-up MOCK=echo IF_MTU=1492 export IFACE=eth0 PHASE=up MOCK=echo IF_MTU=1492
atf_check -s exit:0 -o match:'ip link set up dev eth0 mtu 1492' \ atf_check -s exit:0 -o match:'ip link set up dev eth0 mtu 1492' \
${EXECUTOR} ${EXECUTOR}
} }
vlan_explicit_up_body() { vlan_explicit_up_body() {
export IFACE=servers PHASE=pre-up MOCK=echo \ export IFACE=servers PHASE=up MOCK=echo \
IF_VLAN_RAW_DEVICE="eth0" IF_VLAN_ID="123" IF_VLAN_RAW_DEVICE="eth0" IF_VLAN_ID="123"
atf_check -s exit:0 -o match:'ip link add link eth0 name servers type vlan id 123' \ atf_check -s exit:0 -o match:'ip link add link eth0 name servers type vlan id 123' \
${EXECUTOR} ${EXECUTOR}
} }
vlan_explicit_down_body() { vlan_explicit_down_body() {
export IFACE=servers PHASE=post-down MOCK=echo \ export IFACE=servers PHASE=down MOCK=echo \
IF_VLAN_RAW_DEVICE="eth0" IF_VLAN_ID="123" IF_VLAN_RAW_DEVICE="eth0" IF_VLAN_ID="123"
atf_check -s exit:0 -o match:'ip link delete link eth0 name servers type vlan id 123' \ atf_check -s exit:0 -o match:'ip link delete link eth0 name servers type vlan id 123' \
${EXECUTOR} ${EXECUTOR}
} }
vlan_guessed_up_body() { vlan_guessed_up_body() {
export IFACE=eth0.8 PHASE=pre-up MOCK=echo export IFACE=eth0.8 PHASE=up MOCK=echo
atf_check -s exit:0 -o match:'ip link add link eth0 name eth0.8 type vlan id 8' \ atf_check -s exit:0 -o match:'ip link add link eth0 name eth0.8 type vlan id 8' \
${EXECUTOR} ${EXECUTOR}
} }
vlan_guessed_down_body() { vlan_guessed_down_body() {
export IFACE=eth0.8 PHASE=post-down MOCK=echo export IFACE=eth0.8 PHASE=down MOCK=echo
atf_check -s exit:0 -o match:'ip link delete link eth0 name eth0.8 type vlan id 8' \ atf_check -s exit:0 -o match:'ip link delete link eth0 name eth0.8 type vlan id 8' \
${EXECUTOR} ${EXECUTOR}
} }
vlan_explicit_depend_body() { vlan_explicit_depend_body() {
export IFACE=servers PHASE=pre-up MOCK=echo \ export IFACE=servers PHASE=up MOCK=echo \
IF_VLAN_RAW_DEVICE="eth0" IF_VLAN_ID="123" IF_VLAN_RAW_DEVICE="eth0" IF_VLAN_ID="123"
atf_check -s exit:0 -o match:'eth0' \ atf_check -s exit:0 -o match:'eth0' \
${EXECUTOR} ${EXECUTOR}