From f5b35f7ef89a48dd1b3e4ce3ad95b7db8f93ae96 Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Tue, 31 Jan 2023 15:51:06 +0100 Subject: [PATCH] do not copy resolv.conf, but mount it --- etc/warewulf.conf | 4 ++++ internal/pkg/api/apiconfig/container/container.go | 6 ------ internal/pkg/api/container/container.go | 6 ------ 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/etc/warewulf.conf b/etc/warewulf.conf index d0a0c4db..a5b9a346 100644 --- a/etc/warewulf.conf +++ b/etc/warewulf.conf @@ -29,3 +29,7 @@ nfs: mount options: defaults mount: false systemd name: nfs-server +container mounts: + - source: /etc/resolv.conf + dest: /etc/resolv.conf + readonly: true diff --git a/internal/pkg/api/apiconfig/container/container.go b/internal/pkg/api/apiconfig/container/container.go index 8bc2ba23..beb29544 100644 --- a/internal/pkg/api/apiconfig/container/container.go +++ b/internal/pkg/api/apiconfig/container/container.go @@ -192,12 +192,6 @@ func ContainerImport(cip *wwapiv1.ContainerImportParameter) (containerName strin return } - fmt.Printf("Updating the container's /etc/resolv.conf\n") - err = util.CopyFile("/etc/resolv.conf", path.Join(container.RootFsDir(cip.Name), "/etc/resolv.conf")) - if err != nil { - wwlog.Warn("Could not copy /etc/resolv.conf into container: %s", err) - } - fmt.Printf("Building container: %s\n", cip.Name) err = container.Build(cip.Name, true) if err != nil { diff --git a/internal/pkg/api/container/container.go b/internal/pkg/api/container/container.go index 757ea873..6683c75c 100644 --- a/internal/pkg/api/container/container.go +++ b/internal/pkg/api/container/container.go @@ -197,12 +197,6 @@ func ContainerImport(cip *wwapiv1.ContainerImportParameter) (containerName strin return } - wwlog.Info("Updating the container's /etc/resolv.conf") - err = util.CopyFile("/etc/resolv.conf", path.Join(container.RootFsDir(cip.Name), "/etc/resolv.conf")) - if err != nil { - wwlog.Warn("Could not copy /etc/resolv.conf into container: %s", err) - } - err = container.SyncUids(cip.Name, !cip.SyncUser) if err != nil && !cip.SyncUser { err = fmt.Errorf("error in user sync, fix error and run 'syncuser' manually: %s", err)