Changeset 10732 in genesis


Ignore:
Timestamp:
May 8, 2012, 10:51:51 PM (13 years ago)
Author:
rick
Message:

Als je goede interfaces opgeeft dan loopt die over de andere niet te klagen.

Related-To: nodefactory#156

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/gformat.py

    r10731 r10732  
    122122
    123123  dhcp_interfaces = [datadump[key]['autogen_ifname'] for key in datadump['autogen_iface_keys'] if datadump[key]['dhcp']]
    124   datadump['autogen_dhcp_interfaces'] = ','.join(dhcp_interfaces)
     124  datadump['autogen_dhcp_interfaces'] = dhcp_interfaces
    125125  datadump['autogen_item'] = item
    126126
     
    593593    dnsmasq_enable="NO"
    594594    named_enable="YES"
     595    {% if autogen_dhcp_interfaces -%}
    595596    dhcpd_enable="YES"
     597    dhcpd_flags="$dhcpd_flags {{ autogen_dhcp_interfaces|join(' ') }}"
     598    {% endif -%}
    596599  {% endif -%}
    597600
     
    609612list_normal_proxies="{{ autogen_normal_proxies_ips }}"
    610613
    611 captive_portal_interfaces="{{ autogen_dhcp_interfaces }}"
     614captive_portal_interfaces="{{ autogen_dhcp_interfaces|join(',') }}"
    612615
    613616lvrouted_flags="-u -s s00p3rs3kr3t -m 28 -z $list_ileiden_proxies"
Note: See TracChangeset for help on using the changeset viewer.