Merge pull request containers#2117 from anderbubble/dircopy-leave-socket

Update copy.DirCopy to leave sockets in the file system
anderbubble · Nov 4, 2024 · 960e8dd · 960e8dd
2 parents 5958b09 + 6e4298e
commit 960e8dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/drivers/copy/copy_linux.go b/drivers/copy/copy_linux.go
@@ -16,7 +16,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"net"
 	"os"
 	"path/filepath"
 	"strings"
@@ -199,11 +198,9 @@ func DirCopy(srcDir, dstDir string, copyMode Mode, copyXattrs bool) error {
 			}
 
 		case mode&os.ModeSocket != 0:
-			s, err := net.Listen("unix", dstPath)
-			if err != nil {
+			if err := unix.Mknod(dstPath, stat.Mode, int(stat.Rdev)); err != nil {
 				return err
 			}
-			s.Close()
 
 		case mode&os.ModeDevice != 0:
 			if unshare.IsRootless() {

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 {
+		socketPath := filepath.Join(srcDir, "srcsocket")
+		s, err := net.ListenUnix("unix", &net.UnixAddr{Name: socketPath, Net: "unix"})
+		assert.NilError(t, err)
+		s.SetUnlinkOnClose(false)
+		s.Close()
 		return
 	}
 	aTime := time.Unix(rand.Int63(), 0)