From 7ade65c73f1dd6367a771a59e9dbf1cac8b71f0f Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.de>
Date: Mon, 16 Jan 2023 17:12:14 +0100
Subject: [PATCH] cleaned up container exec __child

---
 .../app/wwctl/container/exec/child/main.go    | 28 ++++---------------
 internal/app/wwctl/container/shell/main.go    | 19 -------------
 2 files changed, 6 insertions(+), 41 deletions(-)

diff --git a/internal/app/wwctl/container/exec/child/main.go b/internal/app/wwctl/container/exec/child/main.go
index dda8b757..f7d89d30 100644
--- a/internal/app/wwctl/container/exec/child/main.go
+++ b/internal/app/wwctl/container/exec/child/main.go
@@ -8,7 +8,6 @@ import (
 	"os"
 	"path"
 	"syscall"
-	"time"
 
 	"github.com/hpcng/warewulf/internal/pkg/container"
 	"github.com/hpcng/warewulf/internal/pkg/util"
@@ -30,16 +29,13 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 		os.Exit(1)
 	}
 	containerPath := container.RootFsDir(containerName)
-	fileStat, _ := os.Stat(path.Join(containerPath, "/etc/passwd"))
-	unixStat := fileStat.Sys().(*syscall.Stat_t)
-	passwdTime := time.Unix(int64(unixStat.Ctim.Sec), int64(unixStat.Ctim.Nsec))
-	fileStat, _ = os.Stat(path.Join(containerPath, "/etc/group"))
-	unixStat = fileStat.Sys().(*syscall.Stat_t)
-	groupTime := time.Unix(int64(unixStat.Ctim.Sec), int64(unixStat.Ctim.Nsec))
-	wwlog.Debug("passwd: %v", passwdTime)
-	wwlog.Debug("group: %v", groupTime)
 
-	err := syscall.Mount("", "/", "", syscall.MS_PRIVATE|syscall.MS_REC, "")
+	mountFlags := uintptr(syscall.MS_PRIVATE | syscall.MS_REC)
+	if unix.Access(containerPath, unix.W_OK) != nil {
+		wwlog.Verbose("Path %s is readonly, mounting %s as ro", containerPath, containerName)
+		mountFlags |= syscall.MS_RDONLY
+	}
+	err := syscall.Mount("", "/", "", mountFlags, "")
 	if err != nil {
 		return errors.Wrap(err, "failed to mount")
 	}
@@ -93,18 +89,6 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 		wwlog.Error("%s", err)
 		os.Exit(1)
 	}
-	fileStat, _ = os.Stat(path.Join(containerPath, "/etc/passwd"))
-	unixStat = fileStat.Sys().(*syscall.Stat_t)
-	if passwdTime.Before(time.Unix(int64(unixStat.Ctim.Sec), int64(unixStat.Ctim.Nsec))) {
-		wwlog.Warn("/etc/passwd has been modified, maybe you want to run syncuser")
-	}
-	wwlog.Debug("passwd: %v", time.Unix(int64(unixStat.Ctim.Sec), int64(unixStat.Ctim.Nsec)))
-	fileStat, _ = os.Stat(path.Join(containerPath, "/etc/group"))
-	unixStat = fileStat.Sys().(*syscall.Stat_t)
-	if groupTime.Before(time.Unix(int64(unixStat.Ctim.Sec), int64(unixStat.Ctim.Nsec))) {
-		wwlog.Warn("/etc/group has been modified, maybe you want to run syncuser")
-	}
-	wwlog.Debug("group: %v", time.Unix(int64(unixStat.Ctim.Sec), int64(unixStat.Ctim.Nsec)))
 
 	return nil
 }
diff --git a/internal/app/wwctl/container/shell/main.go b/internal/app/wwctl/container/shell/main.go
index 1de424c3..01a5cd04 100644
--- a/internal/app/wwctl/container/shell/main.go
+++ b/internal/app/wwctl/container/shell/main.go
@@ -31,23 +31,4 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 	wwlog.Debug("Calling exec with args: %s", allargs)
 	cntexec.SetBinds(binds)
 	return cntexec.CobraRunE(cmd, allargs)
-	/*
-		c := exec.Command("/proc/self/exe", append([]string{"container", "exec"}, allargs...)...)
-
-		//c := exec.Command("/bin/sh")
-		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
-
-		os.Setenv("WW_CONTAINER_SHELL", containerName)
-
-		if err := c.Run(); err != nil {
-			fmt.Println(err)
-			os.Exit(1)
-		}
-	*/
-	return nil
 }