vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #23912 from dmcgowan/fix-overlay2-whiteout-exclusion

Browse source 
Fix overlay2 ignoring whiteout files
This commit is contained in:
Vincent Demeester 2016-06-24 01:06:38 +02:00 committed by GitHub
commit 120a4b0276
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
archive/archive.go
View file

@ -359,7 +359,7 @@ func (ta *tarAppender) addTarFile(path, name string) error {
return err return err
} }
if hdr.Typeflag == tar.TypeReg { if hdr.Typeflag == tar.TypeReg && hdr.Size > 0 {
file, err := os.Open(path) file, err := os.Open(path)
if err != nil { if err != nil {
return err return err

1
archive/archive_linux.go
View file

@ -26,6 +26,7 @@ func (overlayWhiteoutConverter) ConvertWrite(hdr *tar.Header, path string, fi os
hdr.Name = WhiteoutPrefix + hdr.Name hdr.Name = WhiteoutPrefix + hdr.Name
hdr.Mode = 0600 hdr.Mode = 0600
hdr.Typeflag = tar.TypeReg hdr.Typeflag = tar.TypeReg
hdr.Size = 0
} }
if fi.Mode()&os.ModeDir != 0 { if fi.Mode()&os.ModeDir != 0 {