fix volume permission with cgroup v2

hashicorp · Jun 13, 2022 · 62b97ba · 62b97ba
1 parent 2efea2f
commit 62b97ba
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lxc/lxc.go b/lxc/lxc.go
@@ -150,8 +150,11 @@ func (d *Driver) mountVolumes(c *lxc.Container, cfg *drivers.TaskConfig, taskCon
 	}
 
 	for _, cgroupDev := range devCgroupAllows {
-		if err := c.SetConfigItem("lxc.cgroup.devices.allow", cgroupDev); err != nil {
-			return fmt.Errorf("error setting cgroup permission %q error: %v", cgroupDev, err)
+		// Try unified, fallback to legacy
+		if err := c.SetConfigItem("lxc.cgroup2.devices.allow", cgroupDev); err != nil {
+			if err := c.SetConfigItem("lxc.cgroup.devices.allow", cgroupDev); err != nil {
+				return fmt.Errorf("error setting cgroup permission %q error: %v", cgroupDev, err)
+			}
 		}
 	}