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

Merge pull request #647 from Prepultrue/development

Browse Source 
Set umask to 0000 while overlays are being built. Fixes #584
This commit is contained in:
Christian Goll
2023-01-18 21:25:11 +01:00
committed by GitHub
parent a492888d5f 404710dd2d
commit 52cddcab25
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -44,6 +44,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Set correct overlay permissions for a NetworkManager configuration - Set correct overlay permissions for a NetworkManager configuration
file. #591 file. #591
### Fixed
- Directories within overlays no longer lose group/other write permissions #584
## [4.4.0rc2] 2022-12-09 ## [4.4.0rc2] 2022-12-09
### Added ### Added

4
internal/pkg/overlay/overlay.go
View File

@@ -11,6 +11,7 @@ import (
"path/filepath" "path/filepath"
"regexp" "regexp"
"strings" "strings"
"syscall"
"text/template" "text/template"
"github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/node"
@@ -197,6 +198,9 @@ func BuildOverlayIndir(nodeInfo node.NodeInfo, overlayNames []string, outputDir
return errors.Errorf("overlay names contains illegal characters: %v", overlayNames) return errors.Errorf("overlay names contains illegal characters: %v", overlayNames)
} }
// Temporarily set umask to 0000, so directories in the overlay retain permissions
defer syscall.Umask(syscall.Umask(0))
wwlog.Verbose("Processing node/overlay: %s/%s", nodeInfo.Id.Get(), strings.Join(overlayNames, "-")) wwlog.Verbose("Processing node/overlay: %s/%s", nodeInfo.Id.Get(), strings.Join(overlayNames, "-"))
for _, overlayName := range overlayNames { for _, overlayName := range overlayNames {
wwlog.Verbose("Building overlay %s for node %s in %s", overlayName, nodeInfo.Id.Get(), outputDir) wwlog.Verbose("Building overlay %s for node %s in %s", overlayName, nodeInfo.Id.Get(), outputDir)