From b25068521afdb9a10b5cdbbd0a92299c089fe26c Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Thu, 31 Mar 2022 08:19:21 +0200 Subject: [PATCH 1/2] removed old nfs style from config --- internal/pkg/warewulfconf/datastructure.go | 1 - overlays/host/etc/exports.ww | 3 --- 2 files changed, 4 deletions(-) diff --git a/internal/pkg/warewulfconf/datastructure.go b/internal/pkg/warewulfconf/datastructure.go index 7d9be76e..c0360e9a 100644 --- a/internal/pkg/warewulfconf/datastructure.go +++ b/internal/pkg/warewulfconf/datastructure.go @@ -47,7 +47,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 }} From 5333208efb9d116b33f73086ce1b9f9fdef73874 Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Fri, 1 Apr 2022 11:27:14 +0200 Subject: [PATCH 2/2] removed nfs old exports from fstab --- overlays/wwinit/etc/fstab.ww | 3 --- 1 file changed, 3 deletions(-) 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 }}