Skip to content

Commit 836d44a

Browse files
author
Ritwick DSouza
committed
[raspbian] Fixed autostart output
1 parent 067c2e1 commit 836d44a

2 files changed

Lines changed: 22 additions & 14 deletions

File tree

netjsonconfig/backends/raspbian/converters/interfaces.py

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,29 @@ def _get_interface(self, interface):
2828
'address': addresses
2929
})
3030
routes = get_copy(self.netjson, 'routes')
31+
new_interface.update({
32+
'mac': interface.get('mac', None),
33+
'mtu': interface.get('mtu', None),
34+
'txqueuelen': interface.get('txqueuelen', None),
35+
'autostart': interface.get('autostart', True),
36+
})
3137
if routes:
3238
route = self._get_route(routes)
3339
new_interface.update({'route': route})
34-
mac = interface.get('mac', False)
35-
if mac:
36-
new_interface.update({'mac': mac})
37-
mtu = interface.get('mtu', False)
38-
if mtu:
39-
new_interface.update({'mtu': mtu})
40-
txqueuelen = interface.get('txqueuelen', False)
41-
if txqueuelen:
42-
new_interface.update({'txqueuelen': txqueuelen})
43-
autostart = interface.get('autostart', True)
44-
if autostart:
45-
new_interface.update({'autostart': True})
46-
else:
47-
new_interface.update({'autostart': False})
40+
# mac = interface.get('mac', False)
41+
# if mac:
42+
# new_interface.update({'mac': mac})
43+
# mtu = interface.get('mtu', False)
44+
# if mtu:
45+
# new_interface.update({'mtu': mtu})
46+
# txqueuelen = interface.get('txqueuelen', False)
47+
# if txqueuelen:
48+
# new_interface.update({'txqueuelen': txqueuelen})
49+
# autostart = interface.get('autostart', True)
50+
# if autostart:
51+
# new_interface.update({'autostart': True})
52+
# else:
53+
# new_interface.update({'autostart': False})
4854
if iftype == 'wireless' and interface.get('wireless').get('mode') == 'adhoc':
4955
wireless = interface.get('wireless')
5056
new_interface.update({

netjsonconfig/backends/raspbian/templates/interfaces.jinja2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,9 @@
9191
{% endif%}
9292
{% endfor %}
9393
{% else %}
94+
{% if interface.autostart %}
9495
auto {{ interface.ifname }}
96+
{% endif %}
9597
{% if interface.iftype in ['ethernet', 'wireless'] and interface.mode != 'adhoc' %}
9698
iface {{ interface.ifname }} inet manual
9799
{% set route = interface.route %}

0 commit comments

Comments
 (0)