Update copy.DirCopy to not unlink sockets

- Closes containers#2113 `copy.DirCopy` contains code to create named sockets matching those on the source; however, this operation closes the socket, removing it implicitly from the destination and causing later chown and chmod operations to fail. This commit removes configures the socket to not unlink the underlying socket file from the file system during `.Close()`, leaving the socket in place at the destination, as it is in the source. Signed-off-by: Jonathon Anderson <[email protected]>
anderbubble · Sep 28, 2024 · 3f59448 · 3f59448
1 parent f45f1ed
commit 3f59448
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/drivers/copy/copy_linux.go b/drivers/copy/copy_linux.go
@@ -203,6 +203,7 @@ func DirCopy(srcDir, dstDir string, copyMode Mode, copyXattrs bool) error {
 			if err != nil {
 				return err
 			}
+			s.SetUnlinkOnClose(false)
 			s.Close()
 
 		case mode&os.ModeDevice != 0:

diff --git a/drivers/copy/copy_test.go b/drivers/copy/copy_test.go
@@ -5,6 +5,7 @@ package copy
 import (
 	"fmt"
 	"math/rand"
+	"net"
 	"os"
 	"path/filepath"
 	"syscall"
@@ -83,6 +84,11 @@ func randomMode(baseMode int) os.FileMode {
 
 func populateSrcDir(t *testing.T, srcDir string, remainingDepth int) {
 	if remainingDepth == 0 {
+		socketName := filepath.Join(srcDir, "srcsocket")
+		s, err := net.Listen("unix", socketName)
+		assert.NilError(t, err)
+		s.SetUnlinkOnClose(false)
+		s.Close()
 		return
 	}
 	aTime := time.Unix(rand.Int63(), 0)