kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-06-29 16:56:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable NoLchown

Browse Source 
This caused to drop file permissions
This commit is contained in:
Ettore Di Giacinto 2021-03-18 10:48:23 +01:00
parent 4f1e4c0b41
commit f0a34f1cf0
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/helpers/archive.go
View File

@ -95,9 +95,7 @@ func UntarProtect(src, dst string, sameOwner bool, protectedFiles []string, modi
replacerArchive := archive.ReplaceFileTarWrapper(in, mods) replacerArchive := archive.ReplaceFileTarWrapper(in, mods)
opts := &archive.TarOptions{ opts := &archive.TarOptions{
// NOTE: NoLchown boolean is used for chmod of the symlink NoLchown: false,
// Probably it's needed set this always to true.
NoLchown: true,
ExcludePatterns: []string{"dev/"}, // prevent 'operation not permitted' ExcludePatterns: []string{"dev/"}, // prevent 'operation not permitted'
ContinueOnError: true, ContinueOnError: true,
} }
@ -201,12 +199,8 @@ func Untar(src, dest string, sameOwner bool) error {
defer in.Close() defer in.Close()
if sameOwner { if sameOwner {
// PRE: i have root privileged.
opts := &archive.TarOptions{ opts := &archive.TarOptions{
// NOTE: NoLchown boolean is used for chmod of the symlink NoLchown: false,
// Probably it's needed set this always to true.
NoLchown: true,
ExcludePatterns: []string{"dev/"}, // prevent 'operation not permitted' ExcludePatterns: []string{"dev/"}, // prevent 'operation not permitted'
ContinueOnError: true, ContinueOnError: true,
} }

2
pkg/helpers/imgworker/unpack.go
View File

@ -71,7 +71,7 @@ func (c *Client) Unpack(image, dest string) error {
// Unpack the tarfile to the rootfs path. // Unpack the tarfile to the rootfs path.
// FROM: https://godoc.org/github.com/moby/moby/pkg/archive#TarOptions // FROM: https://godoc.org/github.com/moby/moby/pkg/archive#TarOptions
if err := archive.Untar(content.NewReader(layer), dest, &archive.TarOptions{ if err := archive.Untar(content.NewReader(layer), dest, &archive.TarOptions{
NoLchown: true, NoLchown: false,
ExcludePatterns: []string{"dev/"}, // prevent 'operation not permitted' ExcludePatterns: []string{"dev/"}, // prevent 'operation not permitted'
}); err != nil { }); err != nil {
return fmt.Errorf("extracting tar for %s to directory %s failed: %v", desc.Digest.String(), dest, err) return fmt.Errorf("extracting tar for %s to directory %s failed: %v", desc.Digest.String(), dest, err)