Skip to content
This repository has been archived by the owner on May 4, 2021. It is now read-only.

resolve sysmlink issue posted in #301 #304

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

resolve sysmlink issue posted in #301 #304

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 41 additions & 6 deletions lib/snapshot/mem_fs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,18 +111,53 @@ func (fs *MemFS) Checkpoint(newRoot string, sources []string) error {
return fmt.Errorf("trim src %s: %s", src, err)
}
dst := filepath.Join(newRoot, trimmedSrc)
sourceInfo, err := os.Stat(src)
sourceInfo, err := os.Lstat(src)
if err != nil {
return fmt.Errorf("stat %s: %s", src, err)
return fmt.Errorf("lstat %s: %s", src, err)
}

if sourceInfo.IsDir() {
if err := copier.CopyDirPreserveOwner(src, dst); err != nil {
return fmt.Errorf("copy dir %s: %s", src, err)
}
} else {
if err := copier.CopyFilePreserveOwner(src, dst); err != nil {
return fmt.Errorf("copy file %s: %s", src, err)
if sourceInfo.Mode()&os.ModeSymlink != 0 {
var linkTarget string
for sourceInfo.Mode()&os.ModeSymlink != 0 {
linkTarget, err = os.Readlink(src)
if err != nil {
return fmt.Errorf("read link %s: %s", src, err)
}

// Update sourceInfo and src
src = linkTarget
sourceInfo, err = os.Lstat(src)
if err != nil {
return fmt.Errorf("lstat %s: %s", src, err)
}
}
linkTargetCopy := filepath.Join(newRoot, linkTarget)
linkTargetFi, err := os.Lstat(linkTarget)
if err != nil {
return fmt.Errorf("lstat %s: %s", linkTarget, err)
}
// Copy the linkTarget under newRoot.
if linkTargetFi.IsDir() {
if err := copier.CopyDirPreserveOwner(linkTarget, linkTargetCopy); err != nil {
return fmt.Errorf("copy dir %s: %s", linkTarget, err)
}
} else {
if err := copier.CopyFilePreserveOwner(linkTarget, linkTargetCopy); err != nil {
return fmt.Errorf("copy file %s: %s", linkTarget, err)
}
}
if err := os.Symlink(linkTargetCopy, dst); err != nil {
return fmt.Errorf("write link %s with content %s: %s", dst, linkTargetCopy, err)
}
} else {
if err := copier.CopyFilePreserveOwner(src, dst); err != nil {
return fmt.Errorf("copy file %s: %s", src, err)
}
}
}
}
Expand Down Expand Up @@ -342,8 +377,8 @@ func (fs *MemFS) addToLayer(l *memLayer, c *CopyOperation) error {

if len(c.srcs) == 1 {
src := filepath.Join(c.srcRoot, c.srcs[0])
if fi, err := os.Stat(src); err != nil {
return fmt.Errorf("stat src %s: %s", src, err)
if fi, err := os.Lstat(src); err != nil {
return fmt.Errorf("lstat src %s: %s", src, err)
} else if !fi.IsDir() {
// Case 1, no need to ensure dst exists explicitly.
createDst = false
Expand Down