Merge pull request #350 from hpcng/nfs-cleanup

removed old nfs style from config
2022-04-06 21:29:07 +02:00
parent 05c722680f 5333208efb
commit d13a66e4a4
3 changed files with 0 additions and 7 deletions
--- a/internal/pkg/warewulfconf/datastructure.go
+++ b/internal/pkg/warewulfconf/datastructure.go
@@ -48,7 +48,6 @@ type TftpConf struct {

 type NfsConf struct {
 	Enabled         bool             `default:"true" yaml:"enabled"`
-	Exports         []string         `yaml:"exports"`
 	ExportsExtended []*NfsExportConf `yaml:"export paths"`
 	SystemdName     string           `yaml:"systemd name"`
 }
--- a/overlays/host/etc/exports.ww
+++ b/overlays/host/etc/exports.ww
@@ -8,9 +8,6 @@
 {{- range .Nfs.ExportsExtended }}
 {{ .Path }} {{ $network }}/{{ $netmask }}({{ .ExportOptions }})
 {{- end }}
-{{range .Nfs.Exports }}
-{{ . }} {{ $network }}/{{ $netmask }}(rw,sync)
-{{- end }}
 {{- else }}
 {{ abort }}
 {{- end }}
--- a/overlays/wwinit/etc/fstab.ww
+++ b/overlays/wwinit/etc/fstab.ww
@@ -15,6 +15,3 @@ proc /proc proc defaults 0 0
 {{- end }}
 {{- end }}
 {{- end }}
-{{- range .Nfs.Exports }}
-{{ $IP }}:{{ . }} {{ . }} nfs defaults 0 0
-{{- end }}