kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #373 from mslacken/overlay-fixes

Browse Source 
various fixes in overlays
This commit is contained in:
Christian Goll
2022-04-09 13:35:00 +02:00
committed by GitHub
parent 68946d344d 59eb2a091e
commit ef0dd59fbd
5 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
overlays/generic/etc/passwd.ww
View File

@@ -1,3 +1 @@
root::0:0:root:/root:/bin/bash
{{IncludeFrom $.Container "/etc/passwd"}} {{IncludeFrom $.Container "/etc/passwd"}}
{{Include "/etc/passwd"}}

4
overlays/wwinit/etc/issue.ww
View File

@@ -7,6 +7,6 @@ Network:
{{- range $devname, $netdev := .NetDevs}} {{- range $devname, $netdev := .NetDevs}}
{{$devname}}: {{$netdev.Device}} {{$devname}}: {{$netdev.Device}}
{{$devname}}: {{$netdev.IpCIDR}} {{$devname}}: {{$netdev.IpCIDR}}
{{if $netdev.Ipaddr6 }} {{$devname}}: {{$netdev.Ipaddr6}}{{ end }} {{if $netdev.Ipaddr6 }} {{$devname}}: {{$netdev.Ipaddr6}}{{ end -}}
{{if $netdev.Hwaddr }} {{$devname}}: {{$netdev.Hwaddr}}{{ end }} {{if $netdev.Hwaddr }} {{$devname}}: {{$netdev.Hwaddr}}{{ end -}}
{{end}} {{end}}

4
overlays/wwinit/etc/sysconfig/network-scripts/ifcfg.ww
View File

@@ -25,7 +25,7 @@ IPV6INIT=yes
IPV6_AUTOCONF=yes IPV6_AUTOCONF=yes
IPV6_DEFROUTE=yes IPV6_DEFROUTE=yes
IPV6_FAILURE_FATAL=no IPV6_FAILURE_FATAL=no
{{ if $.NetDevs.default.Ipaddr6 -}} {{ if $netdev.Ipaddr6 -}}
IPV6ADDR="{{ $.NetDevs.default.Ipaddr6 }}" IPV6ADDR="{{ $netdev.Ipaddr6 }}"
{{ end -}} {{ end -}}
{{ end -}} {{ end -}}

2
overlays/wwinit/etc/systemd/system/wwclient.service
View File

@@ -5,7 +5,7 @@ After=local-fs.target
[Service] [Service]
Type=notify Type=notify
ExecStart=/warewulf/bin/wwclient ExecStart=/warewulf/wwclient
ExecReload=/bin/kill -s SIGHUP "$MAINPID" ExecReload=/bin/kill -s SIGHUP "$MAINPID"
PIDFile=/var/run/wwclient.pid PIDFile=/var/run/wwclient.pid
TimeoutSec=60 TimeoutSec=60

4
overlays/wwinit/etc/wicked/ifconfig/ifcfg.xml.ww
View File

@@ -38,10 +38,10 @@ Source: {{ $source }}
<privacy>prefer-public</privacy> <privacy>prefer-public</privacy>
<accept-redirects>false</accept-redirects> <accept-redirects>false</accept-redirects>
</ipv6> </ipv6>
{{ if $.NetDevs.default.Ipaddr6 -}} {{ if $netdev.Ipaddr6 -}}
<ipv6:static> <ipv6:static>
<address> <address>
<local>{{ $.NetDevs.default.Ipaddr6 }}</local> <local>{{ $netdev.Ipaddr6 }}</local>
</address> </address>
</ipv6:static> </ipv6:static>
{{ end -}} {{ end -}}