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

Container exec fixups

Browse Source
This commit is contained in:
Gregory Kurtzer
2021-09-08 11:40:14 -07:00
parent a2426d1fd3
commit 09a83ff904
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,6 +61,8 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
}
}
//return errors.New("Test error")
err = syscall.Chroot(containerPath)
if err != nil {
return errors.Wrap(err, "failed to chroot")
@@ -71,17 +73,12 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
return errors.Wrap(err, "failed to chdir")
}
err = syscall.Mount("rootfs", "rootfs", "", syscall.MS_BIND, "")
if err != nil {
return errors.Wrap(err, "failed to mount rootfs")
}
err = syscall.Mount("/proc", "/proc", "proc", 0, "")
if err != nil {
return errors.Wrap(err, "failed to mount proc")
}
ps1string := fmt.Sprintf("[%s] Warewulf> ", containerName)
os.Setenv("PS1", ps1string)
os.Setenv("PS1", fmt.Sprintf("[%s] Warewulf> ", containerName))
os.Setenv("PATH", "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin")
os.Setenv("HISTFILE", "/dev/null")

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

@@ -40,7 +40,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
c.Stderr = os.Stderr
if err := c.Run(); err != nil {
fmt.Println("ERROR", err)
fmt.Println(err)
os.Exit(1)
}