@@ -24,10 +24,10 @@ autoconfigure_tunnel_up_outside() {
2424 ip link add ${DEVNAME_OUTSIDE} type veth peer name ${DEVNAME_INSIDE}
2525 ! tc qdisc del dev ${DEVNAME_INSIDE} root
2626 ip link set ${DEVNAME_OUTSIDE} up
27- ip link set ${DEVNAME_INSIDE} netns %I
27+ ip link set ${DEVNAME_INSIDE} netns ${NSNAME}
2828 # let this fail silently if IPADDR_OUTSIDE is undefined
2929 ! ip address add ${IPADDR_OUTSIDE} dev ${DEVNAME_OUTSIDE}
30- ip -n %I link set ${DEVNAME_INSIDE} up
30+ ip -n ${NSNAME} link set ${DEVNAME_INSIDE} up
3131
3232 if [ ! -z " $MACADDR " ]; then
3333 ip link set ${DEVNAME_INSIDE} address ${MACADDR}
@@ -49,8 +49,8 @@ autoconfigure_tunnel_up_outside() {
4949
5050autoconfigure_tunnel_down_outside () {
5151 # do not run in ExecStartPost to prevent forked dhclient from being killed
52- ! kill -15 ` cat /var/run/netns/dhclient-%i .pid`
53- ! rm /var/run/netns/dhclient-%i .pid
52+ ! kill -15 ` cat /var/run/netns/dhclient-${NSNAME} .pid`
53+ ! rm /var/run/netns/dhclient-${NSNAME} .pid
5454 ip link delete ${DEVNAME_OUTSIDE}
5555}
5656
@@ -111,7 +111,7 @@ autoconfigure_mvbr_up_outside() {
111111autoconfigure_mvbr_down_outside () {
112112 autoconfigure_tunnel_down_outside
113113
114- ip -n %I link delete ${DEVNAME_INSIDE}
114+ ip -n ${NSNAME} link delete ${DEVNAME_INSIDE}
115115}
116116
117117autoconfigure () {
0 commit comments