From 29fc75a2b67294a46b6d4ca38d4de213ac3ec4bf Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Thu, 27 Jan 2022 11:04:52 +0100 Subject: [PATCH] remove default home mount --- internal/app/wwctl/configure/nfs/main.go | 8 -------- internal/pkg/warewulfconf/defaults.go | 6 ------ 2 files changed, 14 deletions(-) diff --git a/internal/app/wwctl/configure/nfs/main.go b/internal/app/wwctl/configure/nfs/main.go index 52b15cd2..a91891dc 100644 --- a/internal/app/wwctl/configure/nfs/main.go +++ b/internal/app/wwctl/configure/nfs/main.go @@ -61,11 +61,6 @@ func Configure(show bool) error { fmt.Fprintf(exports, "# This file was written by Warewulf (wwctl configure nfs)\n") - for _, export := range controller.Nfs.Exports { - fmt.Fprintf(exports, "%s %s/%s(sync)\n", export, controller.Network, controller.Netmask) - fmt.Fprintf(fstab, "%s:%s %s nfs defaults 0 0\n", controller.Ipaddr, export, export) - } - for _, export := range controller.Nfs.ExportsExtended { fmt.Fprintf(exports, "%s %s/%s(%s)\n", export.Path, controller.Network, controller.Netmask, export.ExportOptions) if export.Mount { @@ -102,9 +97,6 @@ func Configure(show bool) error { } fmt.Printf("\n") fmt.Printf("SYSTEM OVERLAY: wwinit/etc/fstab:\n") - for _, export := range controller.Nfs.Exports { - fmt.Printf("%s:%s %s nfs defaults 0 0\n", controller.Ipaddr, export, export) - } for _, export := range controller.Nfs.ExportsExtended { fmt.Printf("%s:%s %s nfs defaults 0 0\n", controller.Ipaddr, export.Path, export.Path) } diff --git a/internal/pkg/warewulfconf/defaults.go b/internal/pkg/warewulfconf/defaults.go index f2961487..4086a28f 100644 --- a/internal/pkg/warewulfconf/defaults.go +++ b/internal/pkg/warewulfconf/defaults.go @@ -26,17 +26,11 @@ func defaultConfig() *ControllerConf { TftpRoot: "/var/lib/tftpboot", SystemdName: "tftp", } - Nfs := &NfsConf{ - Enabled: true, - Exports: []string{"/home"}, - SystemdName: "nfs-server", - } return &ControllerConf{ Warewulf: Warewulf, Dhcp: Dhcp, Tftp: Tftp, - Nfs: Nfs, current: false, } }