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

Working implemnetation of #271

Browse Source
This commit is contained in:
Gregory Kurtzer
2022-02-13 04:22:12 +00:00
parent 486e0079c6
commit 2260be9f8f
2 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,17 +85,6 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
wwlog.Printf(wwlog.ERROR, "%s\n", err) wwlog.Printf(wwlog.ERROR, "%s\n", err)
os.Exit(1) os.Exit(1)
} }
_, err = os.Stat("./etc/warewulf/runExit")
if os.IsNotExist(err) {
wwlog.Printf(wwlog.DEBUG, "no exit script")
return nil
}
wwlog.Printf(wwlog.INFO, "Running exit script %s\n", path.Join(container.RootFsDir(containerName), "./etc/warewulf/runExit"))
err = syscall.Exec("./etc/warewulf/runExit", []string{""}, os.Environ())
if err != nil {
wwlog.Printf(wwlog.ERROR, "%s\n", err)
os.Exit(1)
}
return nil return nil
} }

46
internal/app/wwctl/container/exec/main.go
View File

@@ -7,13 +7,33 @@ import (
"fmt" "fmt"
"os" "os"
"os/exec" "os/exec"
"path"
"syscall" "syscall"
"github.com/hpcng/warewulf/internal/pkg/container" "github.com/hpcng/warewulf/internal/pkg/container"
"github.com/hpcng/warewulf/internal/pkg/util"
"github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/hpcng/warewulf/internal/pkg/wwlog"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
func runContainedCmd(args []string) error {
wwlog.Printf(wwlog.VERBOSE, "Running contained command: %s\n", args[1:])
c := exec.Command("/proc/self/exe", append([]string{"container", "exec", "__child"}, args...)...)
c.SysProcAttr = &syscall.SysProcAttr{
Cloneflags: syscall.CLONE_NEWUTS | syscall.CLONE_NEWPID | syscall.CLONE_NEWNS,
}
c.Stdin = os.Stdin
c.Stdout = os.Stdout
c.Stderr = os.Stderr
if err := c.Run(); err != nil {
fmt.Println(err)
os.Exit(1)
}
return nil
}
func CobraRunE(cmd *cobra.Command, args []string) error { func CobraRunE(cmd *cobra.Command, args []string) error {
containerName := args[0] containerName := args[0]
@@ -29,23 +49,23 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
} }
allargs = append(allargs, args...) allargs = append(allargs, args...)
c := exec.Command("/proc/self/exe", append([]string{"container", "exec", "__child"}, allargs...)...) err := runContainedCmd(allargs)
if err != nil {
//c := exec.Command("/bin/sh") wwlog.Printf(wwlog.ERROR, "Failed executing container command: %s\n", err)
c.SysProcAttr = &syscall.SysProcAttr{
Cloneflags: syscall.CLONE_NEWUTS | syscall.CLONE_NEWPID | syscall.CLONE_NEWNS,
}
c.Stdin = os.Stdin
c.Stdout = os.Stdout
c.Stderr = os.Stderr
if err := c.Run(); err != nil {
fmt.Println(err)
os.Exit(1) os.Exit(1)
} }
if util.IsFile(path.Join(container.RootFsDir(allargs[0]), "/etc/warewulf/container_exit.sh")) {
wwlog.Printf(wwlog.VERBOSE, "Found clean script: /etc/warewulf/container_exit.sh\n")
err = runContainedCmd([]string{allargs[0], "/bin/sh", "/etc/warewulf/container_exit.sh"})
if err != nil {
wwlog.Printf(wwlog.ERROR, "Failed executing exit script: %s\n", err)
os.Exit(1)
}
}
fmt.Printf("Rebuilding container...\n") fmt.Printf("Rebuilding container...\n")
err := container.Build(containerName, false) err = container.Build(containerName, false)
if err != nil { if err != nil {
wwlog.Printf(wwlog.ERROR, "Could not build container %s: %s\n", containerName, err) wwlog.Printf(wwlog.ERROR, "Could not build container %s: %s\n", containerName, err)
os.Exit(1) os.Exit(1)