Merge pull request #1834 from stgraber/main

hallyn · web-flow · commit c3a1d65966f9 · 2025-03-23T21:37:27.000-05:00
incusd/instance/lxc: Cleanup OCI mount paths
diff --git a/internal/server/instance/drivers/driver_lxc.go b/internal/server/instance/drivers/driver_lxc.go
@@ -2378,7 +2378,7 @@ func (d *lxc) startCommon() (string, []func() error, error) {
 				continue
 			}
 
-			lxcMounts = append(lxcMounts, fmt.Sprintf("/%s", fields[1]))
+			lxcMounts = append(lxcMounts, filepath.Clean(fmt.Sprintf("/%s", fields[1])))
 		}
 
 		// Configure mounts.
@@ -2389,7 +2389,7 @@ func (d *lxc) startCommon() (string, []func() error, error) {
 			}
 
 			// Skip all our own mounts.
-			if slices.Contains(lxcMounts, mount.Destination) {
+			if slices.Contains(lxcMounts, filepath.Clean(mount.Destination)) {
 				continue
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -2378,7 +2378,7 @@ func (d *lxc) startCommon() (string, []func() error, error) {`
`2378`	`2378`	`continue`
`2379`	`2379`	`}`
`2380`	`2380`
`2381`		`- lxcMounts = append(lxcMounts, fmt.Sprintf("/%s", fields[1]))`
	`2381`	`+ lxcMounts = append(lxcMounts, filepath.Clean(fmt.Sprintf("/%s", fields[1])))`
`2382`	`2382`	`}`
`2383`	`2383`
`2384`	`2384`	`// Configure mounts.`
`@@ -2389,7 +2389,7 @@ func (d *lxc) startCommon() (string, []func() error, error) {`
`2389`	`2389`	`}`
`2390`	`2390`
`2391`	`2391`	`// Skip all our own mounts.`
`2392`		`- if slices.Contains(lxcMounts, mount.Destination) {`
	`2392`	`+ if slices.Contains(lxcMounts, filepath.Clean(mount.Destination)) {`
`2393`	`2393`	`continue`
`2394`	`2394`	`}`
`2395`	`2395`