1
1
#! /bin/bash
2
2
3
3
set -e
4
-
4
+ set -x
5
5
display_usage () {
6
6
echo " Auto configuration for systemd-named-netns."
7
7
echo -e " \nUsage:\n\t$0 network-type ns-name [optional params] [up|down] [inside|outside]\n"
@@ -26,9 +26,10 @@ autoconfigure_tunnel_up_outside() {
26
26
ip -n ${NSNAME} link set ${DEVNAME_INSIDE} up
27
27
28
28
# add ipv4 address at global end
29
- # let this fail silently if IPADDR_OUTSIDE is undefined
30
- ! ip address add ${IPADDR_OUTSIDE} dev ${DEVNAME_OUTSIDE}
31
-
29
+ if [ ! -z " ${IPADDR_OUTSIDE} " ]; then
30
+ ip address add ${IPADDR_OUTSIDE} dev ${DEVNAME_OUTSIDE}
31
+ fi
32
+
32
33
return 0 # additional precation against "set -e" in case of future mods of this function
33
34
}
34
35
@@ -40,7 +41,7 @@ autoconfigure_tunnel_up_inside() {
40
41
41
42
# setup default route
42
43
if [ ! -z " ${GATEWAY} " ]; then
43
- ip route add default via ${GATEWAY%%/* } onlink
44
+ ip route add default via ${GATEWAY%%/* } dev ${DEVNAME_INSIDE} onlink
44
45
fi
45
46
46
47
# if DHCP is configured
@@ -107,7 +108,7 @@ autoconfigure_nat_up_inside() {
107
108
108
109
# add default route if gateway undefined
109
110
if [ -z " ${GATEWAY} " -a -n " ${IPADDR_OUTSIDE} " ]; then
110
- ip route add default via ${IPADDR_OUTSIDE%%/* }
111
+ GATEWAY= " ${IPADDR_OUTSIDE} "
111
112
fi
112
113
113
114
return 0 # additional precation against "set -e" in case of future mods of this function
@@ -167,8 +168,8 @@ autoconfigure() {
167
168
! source " /etc/default/netns-${NSNAME} " # for compatibility, see https://github.com/Jamesits/systemd-named-netns/pull/21
168
169
! source " /etc/default/netns-${NSTYPE} -${NSNAME} "
169
170
170
- if type -t autoconfigure_${NSTYPE} _${INOUT } _${UPDOWN } > /dev/null ; then
171
- autoconfigure_${NSTYPE} _${INOUT } _${UPDOWN } " $@ "
171
+ if type -t autoconfigure_${NSTYPE} _${UPDOWN } _${INOUT } > /dev/null ; then
172
+ autoconfigure_${NSTYPE} _${UPDOWN } _${INOUT } " $@ "
172
173
echo " Autoconfiguration finished."
173
174
else
174
175
echo " No configuration required."
0 commit comments