Skip to content

Commit 65f4a9b

Browse files
author
Ritwick DSouza
committed
[raspbian] Fixed multiple static routes output
1 parent e5a2acd commit 65f4a9b

1 file changed

Lines changed: 12 additions & 2 deletions

File tree

netjsonconfig/backends/raspbian/templates/interfaces.jinja2

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@
2020
{% if interface.route %}
2121
{% set routes = interface.route %}
2222
{% for route in routes %}
23+
{% if route.version == 4%}
2324
post-up route add -net {{ route.dest }} netmask {{ route.dest_mask }} gw {{ route.next }}
2425
pre-up route del -net {{ route.dest }} netmask {{ route.dest_mask }} gw {{ route.next }}
26+
{% endif %}
2527
{% endfor %}
2628
{% endif %}
2729
{% if interface.mtu %}
@@ -47,8 +49,10 @@
4749
{% if interface.route %}
4850
{% set routes = interface.route %}
4951
{% for route in routes %}
52+
{% if route.version == 6 %}
5053
up ip -6 route add {{ route.destination }} via {{ route.next }} dev eth0
5154
down ip -6 route del {{ route.destination }} via {{ route.next }} dev eth0
55+
{% endif %}
5256
{% endfor %}
5357
{% endif %}
5458
{% if interface.mtu %}
@@ -70,8 +74,10 @@
7074
{% if interface.route %}
7175
{% set routes = interface.route %}
7276
{% for route in routes %}
77+
{% if route.version == 4 %}
7378
post-up route add -net {{ route.dest }} netmask {{ route.dest_mask }} gw {{ route.next }}
7479
pre-up route del -net {{ route.dest }} netmask {{ route.dest_mask }} gw {{ route.next }}
80+
{% endif %}
7581
{% endfor %}
7682
{% endif %}
7783
{% if interface.mtu %}
@@ -85,8 +91,10 @@
8591
{% if interface.route %}
8692
{% set routes = interface.route %}
8793
{% for route in routes %}
94+
{% if route.version == 6 %}
8895
up ip -6 route add {{ route.destination }} via {{ route.next }} dev eth0
8996
down ip -6 route del {{ route.destination }} via {{ route.next }} dev eth0
97+
{% endif %}
9098
{% endfor %}
9199
{% endif %}
92100
{% if interface.mtu %}
@@ -104,18 +112,20 @@
104112
{% endif %}
105113
{% if interface.iftype in ['ethernet', 'wireless'] and interface.mode != 'adhoc' %}
106114
iface {{ interface.ifname }} inet manual
115+
{% if interface.route %}
107116
{% set routes = interface.route %}
108117
{% for route in routes %}
109-
{% if interface.route and route.version == 4 %}
118+
{% if route.version == 4 %}
110119
post-up route add -net {{ route.dest }} netmask {{ route.dest_mask }} gw {{ route.next }}
111120
pre-up route del -net {{ route.dest }} netmask {{ route.dest_mask }} gw {{ route.next }}
112121
{% endif %}
113-
{% if interface.route and route.version == 6 %}
122+
{% if route.version == 6 %}
114123
up ip -6 route add {{ route.destination }} via {{ route.next }} dev eth0
115124
down ip -6 route del {{ route.destination }} via {{ route.next }} dev eth0
116125
{% endif %}
117126
{% endfor %}
118127
{% endif %}
128+
{% endif %}
119129
{% if interface.iftype == 'bridge' %}
120130
bridge_ports {{ interface.bridge_members[0] }} {{ interface.bridge_members[1] }}
121131
{% endif %}

0 commit comments

Comments
 (0)