Merge pull request #1352 from stgraber/main

hallyn · web-flow · commit baa2fad5c3c6 · 2024-11-04T19:05:04.000-06:00
incusd/instance/lxc: Fix LXCFS per-instance path
diff --git a/internal/server/instance/drivers/driver_lxc.go b/internal/server/instance/drivers/driver_lxc.go
@@ -2496,7 +2496,7 @@ ff02::2 ip6-allrouters
 				continue
 			}
 
-			err = lxcSetConfigItem(cc, "lxc.hook.pre-mount", fmt.Sprintf("mount -o bind %s /var/lib/incus-lxcfs/", filepath.Join(d.DevicesPath(), "lxcfs")))
+			err = lxcSetConfigItem(cc, "lxc.hook.pre-mount", fmt.Sprintf("mount -o bind %s %s/", filepath.Join(d.DevicesPath(), "lxcfs"), entry))
 			if err != nil {
 				return "", nil, err
 			}

Original file line number	Diff line number	Diff line change
`@@ -2496,7 +2496,7 @@ ff02::2 ip6-allrouters`
`2496`	`2496`	`continue`
`2497`	`2497`	`}`
`2498`	`2498`
`2499`		`- err = lxcSetConfigItem(cc, "lxc.hook.pre-mount", fmt.Sprintf("mount -o bind %s /var/lib/incus-lxcfs/", filepath.Join(d.DevicesPath(), "lxcfs")))`
	`2499`	`+ err = lxcSetConfigItem(cc, "lxc.hook.pre-mount", fmt.Sprintf("mount -o bind %s %s/", filepath.Join(d.DevicesPath(), "lxcfs"), entry))`
`2500`	`2500`	`if err != nil {`
`2501`	`2501`	`return "", nil, err`
`2502`	`2502`	`}`