diff --git a/internal/pkg/warewulfconf/datastructure.go b/internal/pkg/warewulfconf/datastructure.go index 8c83adf5..a87bd78e 100644 --- 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"` } diff --git a/overlays/host/etc/exports.ww b/overlays/host/etc/exports.ww index 56291e10..33558262 100644 --- 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 }} diff --git a/overlays/wwinit/etc/fstab.ww b/overlays/wwinit/etc/fstab.ww index c5263a3f..d9b60f6e 100644 --- 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 }}