github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-09-05 17:02:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3143 from rn/symlink-fix

Browse Source 
cmd/pkg: Fix symlink handling in pkg build context
This commit is contained in:
Rolf Neugebauer
2018-07-27 20:23:52 +01:00
committed by GitHub
parent 26ae9a0246 23555494fe
commit deb627e56b
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/cmd/linuxkit/pkglib/build.go
View File

@@ -222,7 +222,16 @@ func (c *buildCtx) Copy(w io.WriteCloser) error {
return fmt.Errorf("ctx: Walk error on %s: %v", p, err) return fmt.Errorf("ctx: Walk error on %s: %v", p, err)
} }
h, err := tar.FileInfoHeader(i, "") var link string
if i.Mode()&os.ModeSymlink != 0 {
var err error
link, err = os.Readlink(p)
if err != nil {
return fmt.Errorf("ctx: Failed to read symlink %s: %v", p, err)
}
}
h, err := tar.FileInfoHeader(i, link)
if err != nil { if err != nil {
return fmt.Errorf("ctx: Converting FileInfo for %s: %v", p, err) return fmt.Errorf("ctx: Converting FileInfo for %s: %v", p, err)
} }