fixup! avoid duplicate mounts

johnstcn · johnstcn · commit 55c15f90d8cf · 2025-03-06T11:00:06.000Z
diff --git a/cli/docker.go b/cli/docker.go
@@ -628,7 +628,8 @@ func runDockerCVM(ctx context.Context, log slog.Logger, client dockerutil.Client
 					strings.TrimPrefix(mountpoint, strings.TrimSuffix(flags.hostUsrLibDir, "/")),
 				)
 			}
-			// Avoid duplicate mounts.
+			// Even though xunix.GPUs checks for duplicate mounts, we need to check
+			// for duplicates again here after remapping the path.
 			if slices.ContainsFunc(mounts, func(m xunix.Mount) bool {
 				return m.Mountpoint == mountpoint
 			}) {

Original file line number	Diff line number	Diff line change
`@@ -628,7 +628,8 @@ func runDockerCVM(ctx context.Context, log slog.Logger, client dockerutil.Client`
`628`	`628`	`strings.TrimPrefix(mountpoint, strings.TrimSuffix(flags.hostUsrLibDir, "/")),`
`629`	`629`	`)`
`630`	`630`	`}`
`631`		`- // Avoid duplicate mounts.`
	`631`	`+ // Even though xunix.GPUs checks for duplicate mounts, we need to check`
	`632`	`+ // for duplicates again here after remapping the path.`
`632`	`633`	`if slices.ContainsFunc(mounts, func(m xunix.Mount) bool {`
`633`	`634`	`return m.Mountpoint == mountpoint`
`634`	`635`	`}) {`