File added-function-CopyUIDGID-for-file-file-ownersh... of Package warewulf4

Overview Repositories Revisions Requests Users Attributes Meta

File added-function-CopyUIDGID-for-file-file-ownerships.patch of Package warewulf4 (Revision bd3be6b051436ce478bfe699f6954348)

Currently displaying revision bd3be6b051436ce478bfe699f6954348 , Show latest

From 0945b851165cf7dafc9ee7f321a1cc74690eb80f Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.de>
Date: Thu, 5 Aug 2021 11:54:46 +0200
Subject: [PATCH 2/2] added function CopyUIDGID for file file ownerships file
 ownerships are preserved now in overlays

---
 internal/pkg/overlay/overlay.go | 11 ++++++++-
 internal/pkg/util/util.go       | 41 +++++++++++++++++++++++++++++++--
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/internal/pkg/overlay/overlay.go b/internal/pkg/overlay/overlay.go
index 34ede73..88cb013 100644
--- a/internal/pkg/overlay/overlay.go
+++ b/internal/pkg/overlay/overlay.go
@@ -220,11 +220,16 @@ func buildOverlay(nodeList []node.NodeInfo, overlayType string) error {
 			if info.IsDir() {
 				wwlog.Printf(wwlog.DEBUG, "Found directory: %s\n", location)
 
-				err := os.MkdirAll(path.Join(tmpDir, location), info.Mode())
+				err = os.MkdirAll(path.Join(tmpDir, location), info.Mode())
 				if err != nil {
 					wwlog.Printf(wwlog.ERROR, "%s\n", err)
 					return err
 				}
+        err = util.CopyUIDGID(location,path.Join(tmpDir, location))
+        if err != nil {
+					wwlog.Printf(wwlog.ERROR, "%s\n", err)
+          return err
+        }
 
 			} else if filepath.Ext(location) == ".ww" {
 				wwlog.Printf(wwlog.DEBUG, "Found template file: %s\n", location)
@@ -254,6 +259,10 @@ func buildOverlay(nodeList []node.NodeInfo, overlayType string) error {
 					wwlog.Printf(wwlog.ERROR, "tmpl.Execute %s\n", err)
 					return nil
 				}
+        err = util.CopyUIDGID(location,path.Join(tmpDir, location))
+        if err != nil {
+          return err
+        }
 
 			} else if b, _ := regexp.MatchString(`\.ww[a-zA-Z0-9\-\._]*$`, location); b == true {
 				wwlog.Printf(wwlog.DEBUG, "Ignoring WW template file: %s\n", location)
diff --git a/internal/pkg/util/util.go b/internal/pkg/util/util.go
index d751ee1..3d24b8b 100644
--- a/internal/pkg/util/util.go
+++ b/internal/pkg/util/util.go
@@ -11,6 +11,7 @@ import (
 	"path"
 	"path/filepath"
 	"regexp"
+  "syscall"
 	"time"
 
 	"github.com/hpcng/warewulf/internal/pkg/wwlog"
@@ -84,6 +85,10 @@ func CopyFile(source string, dest string) error {
 		return err
 	}
 
+  CopyUIDGID(source,dest);
+	if err != nil {
+		return err
+	}
 	sourceFD.Close()
 
 	return destFD.Close()
@@ -97,11 +102,26 @@ func CopyFiles(source string, dest string) error {
 
 		if info.IsDir() {
 			wwlog.Printf(wwlog.DEBUG, "Creating directory: %s\n", location)
-
-			err := os.MkdirAll(path.Join(dest, location), info.Mode())
+      info, err := os.Stat(source)
+      if err != nil {
+        return err
+      }
+      // root is always good, if we failt to get UID/GID of a file
+      var UID int = 0
+      var GID int = 0
+      if stat, ok := info.Sys().(*syscall.Stat_t); ok {
+        UID = int(stat.Uid)
+        GID = int(stat.Gid)
+      }
+
+			err = os.MkdirAll(path.Join(dest, location), info.Mode())
 			if err != nil {
 				return err
 			}
+      err = os.Chown(dest,UID,GID)
+      if err != nil {
+        return err
+      }
 
 		} else {
 			wwlog.Printf(wwlog.DEBUG, "Writing file: %s\n", location)
@@ -285,3 +305,20 @@ func SystemdStart(systemdName string) error {
 
 	return nil
 }
+
+func CopyUIDGID(source string, dest string) error {
+  info, err := os.Stat(source)
+	if err != nil {
+		return err
+	}
+  // root is always good, if we failt to get UID/GID of a file
+  var UID int = 0
+  var GID int = 0
+  if stat, ok := info.Sys().(*syscall.Stat_t); ok {
+    UID = int(stat.Uid)
+    GID = int(stat.Gid)
+  }
+  wwlog.Printf(wwlog.DEBUG, "Chown '%i':'%i' '%s'\n",UID,GID, dest)
+  err = os.Chown(dest,UID,GID)
+  return err
+}
-- 
2.32.0

Places

File added-function-CopyUIDGID-for-file-file-ownerships.patch of Package warewulf4 (Revision bd3be6b051436ce478bfe699f6954348)

Places