kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Don't bind resolv.conf, copy on import

Browse Source
This commit is contained in:
Gregory Kurtzer
2021-09-01 19:23:13 -07:00
parent fe821dc3ee
commit fc7182d7bd
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/app/wwctl/container/exec/child/main.go
View File

@@ -11,7 +11,6 @@ import (
"syscall"
"github.com/hpcng/warewulf/internal/pkg/container"
"github.com/hpcng/warewulf/internal/pkg/util"
"github.com/hpcng/warewulf/internal/pkg/wwlog"
"github.com/spf13/cobra"
)
@@ -35,10 +34,6 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
syscall.Mount("", "/", "", syscall.MS_PRIVATE, "")
syscall.Mount("/dev", path.Join(containerPath, "/dev"), "", syscall.MS_BIND, "")
if util.IsFile(path.Join(containerPath, "/etc/resolv.conf")) == true {
syscall.Mount("/etc/resolv.conf", path.Join(containerPath, "/etc/resolv.conf"), "", syscall.MS_BIND, "")
}
for _, b := range binds {
var source string
var dest string

8
internal/app/wwctl/container/imprt/main.go
View File

@@ -121,8 +121,14 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
}
}
fmt.Printf("Updating the container's /etc/resolv.conf\n")
err := util.CopyFile("/etc/resolv.conf", path.Join(container.RootFsDir(name), "/etc/resolv.conf"))
if err != nil {
wwlog.Printf(wwlog.WARN, "Could not copy /etc/resolv.conf into container: %s\n", err)
}
fmt.Printf("Building container: %s\n", name)
err := container.Build(name, true)
err = container.Build(name, true)
if err != nil {
wwlog.Printf(wwlog.ERROR, "Could not build container %s: %s\n", name, err)
os.Exit(1)