Merge pull request #1895 from stgraber/oci

brauner · web-flow · commit 3c10c84b4a0a · 2025-04-05T18:29:03.000+02:00
incusd/instance/lxc: Use pre-existing PATH when not overridden
diff --git a/internal/server/instance/drivers/driver_lxc.go b/internal/server/instance/drivers/driver_lxc.go
@@ -2797,7 +2797,7 @@ func (d *lxc) Start(stateful bool) error {
 
 	_, ok := envDict["PATH"]
 	if !ok {
-		envDict["PATH"] = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+		envDict["PATH"] = os.Getenv("PATH")
 	}
 
 	env := make([]string, 0, len(envDict))

Original file line number	Diff line number	Diff line change
`@@ -2797,7 +2797,7 @@ func (d *lxc) Start(stateful bool) error {`
`2797`	`2797`
`2798`	`2798`	`_, ok := envDict["PATH"]`
`2799`	`2799`	`if !ok {`
`2800`		`- envDict["PATH"] = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"`
	`2800`	`+ envDict["PATH"] = os.Getenv("PATH")`
`2801`	`2801`	`}`
`2802`	`2802`
`2803`	`2803`	`env := make([]string, 0, len(envDict))`