Merge branch 'ipv6'
This commit is contained in:
@@ -7,7 +7,6 @@ Network:
|
||||
{{- range $devname, $netdev := .NetDevs}}
|
||||
{{$devname}}: {{$netdev.Device}}
|
||||
{{$devname}}: {{$netdev.IpCIDR}}
|
||||
{{if $netdev.Hwaddr }}
|
||||
{{$devname}}: {{$netdev.Hwaddr}}
|
||||
{{ end -}}
|
||||
{{end}}
|
||||
{{if $netdev.Ipaddr6 }} {{$devname}}: {{$netdev.Ipaddr6}}{{ end }}
|
||||
{{if $netdev.Hwaddr }} {{$devname}}: {{$netdev.Hwaddr}}{{ end }}
|
||||
{{end}}
|
||||
|
||||
@@ -21,4 +21,11 @@ GATEWAY={{ $netdev.Gateway }}
|
||||
HWADDR={{ $netdev.Hwaddr }}
|
||||
{{ end -}}
|
||||
ONBOOT=yes
|
||||
IPV6INIT=yes
|
||||
IPV6_AUTOCONF=yes
|
||||
IPV6_DEFROUTE=yes
|
||||
IPV6_FAILURE_FATAL=no
|
||||
{{ if $.NetDevs.default.Ipaddr6 -}}
|
||||
IPV6ADDR="{{ $.NetDevs.default.Ipaddr6 }}"
|
||||
{{ end -}}
|
||||
{{ end -}}
|
||||
|
||||
@@ -38,5 +38,12 @@ Source: {{ $source }}
|
||||
<privacy>prefer-public</privacy>
|
||||
<accept-redirects>false</accept-redirects>
|
||||
</ipv6>
|
||||
{{ if $.NetDevs.default.Ipaddr6 -}}
|
||||
<ipv6:static>
|
||||
<address>
|
||||
<local>{{ $.NetDevs.default.Ipaddr6 }}</local>
|
||||
</address>
|
||||
</ipv6:static>
|
||||
{{ end -}}
|
||||
</interface>
|
||||
{{ end -}}
|
||||
|
||||
Reference in New Issue
Block a user