Revision 41f74498 configure-interfaces

b/configure-interfaces
17 17
fi
18 18

  
19 19
if [ -e /proc/sys/net/ipv4/conf/$PUBLIC_VLAN  -o \
20
#     -e /proc/sys/net/ipv4/conf/$PUBLIC_BRIDGE -o \
20
     -e /proc/sys/net/ipv4/conf/$PUBLIC_BRIDGE -o \
21 21
     -e /proc/sys/net/ipv4/conf/$MASQ_VLAN -o \
22 22
     -e /proc/sys/net/ipv4/conf/$MASQ_BRIDGE -o \
23 23
     -e /proc/sys/net/ipv4/conf/$PRIVATE_VLAN -o \
......
34 34

  
35 35

  
36 36

  
37
cat > $INTERFACES<<EOF
38
#auto $PUBLIC_BRIDGE
39
#iface $PUBLIC_BRIDGE inet manual
40
#  bridge_ports $PUBLIC_INTERFACE
41
#  bridge_stp off
42
#  bridge_fd 2
43
#  post-up ip link set $PUBLIC_BRIDGE address $PUBLIC_MAC 
37
if [ -n "$PUBLIC_BRIDGE" -a -n "$PUBLIC_INTERFACE" ]; then
38
  cat > $INTERFACES<<EOF
39
auto $PUBLIC_BRIDGE
40
iface $PUBLIC_BRIDGE inet manual
41
  bridge_ports $PUBLIC_INTERFACE
42
  bridge_stp off
43
  bridge_fd 2
44
  post-up ip link set $PUBLIC_BRIDGE address $PUBLIC_MAC 
44 45

  
46
EOF
47

  
48
else
49
  if [ -n "$PUBLIC_VLAN" ]; then
50
    cat >> $INTERFACES<<EOF
45 51
auto $PUBLIC_VLAN
46 52
iface $PUBLIC_VLAN inet manual
47 53

  
54
EOF
55

  
56
  elif [ -n "$PRIVATE_VLAN" -a -n "$PRIVATE_BRIDGE" ]; then
57
    cat >> $INTERFACES<<EOF
48 58
auto $PRIVATE_VLAN
49 59
iface $PRIVATE_VLAN inet manual
50 60

  
......
55 65
  bridge_fd 2
56 66
  post-up ip link set $PRIVATE_BRIDGE address $PUBLIC_MAC 
57 67

  
68
EOF
69

  
70
  elif [ -n "$MASQ_VLAN" -a -n "$MASQ_BRIDGE" ]; then
71
    cat >> $INTERFACES<<EOF
58 72
auto $MASQ_VLAN
59 73
iface $MASQ_VLAN inet manual
60 74

  
......
64 78
  bridge_stp off
65 79
  bridge_fd 2
66 80
  post-up ip link set $MASQ_BRIDGE address $PUBLIC_MAC 
81

  
67 82
EOF
68 83

  
84
  fi
85
fi
69 86

  
70 87
ifup -i $INTERFACES -a
71 88

  

Also available in: Unified diff