Merged oherrala-network into master

This commit is contained in:
Ossi Herrala 2015-09-30 13:07:40 +03:00
commit 6013ab9aae

View file

@ -17,12 +17,15 @@ NOZEROCONF=yes
<% end -%> <% end -%>
<% if @ip6addr == 'none' -%> <% if @ip6addr == 'none' -%>
IPV6INIT=no IPV6INIT=no
IPV6_AUTOCONF=no
<% elsif @ip6addr == 'auto' -%>
IPV6INIT=yes
IPV6_AUTOCONF=yes
<% else -%> <% else -%>
IPV6INIT=yes IPV6INIT=yes
<% if @ip6addr != 'auto' -%> IPV6_AUTOCONF=no
IPV6ADDR=<%= @ip6addr %>/<%= @ip6netmask %> IPV6ADDR=<%= @ip6addr %>/<%= @ip6netmask %>
<% end -%> <% end -%>
<% end -%>
<% if @name =~ /br[0-9]/ -%> <% if @name =~ /br[0-9]/ -%>
TYPE=Bridge TYPE=Bridge
DELAY=0 DELAY=0