From 1bc028590575004334f9788b0a4fbe824b1fd13c Mon Sep 17 00:00:00 2001
From: Miao Wang <shankerwangmiao@gmail.com>
Date: Tue, 27 Jul 2021 01:30:16 +0800
Subject: [PATCH] cgroupv2: bypass RequireDevices check

---
 .github/workflows/tunasync.yml | 2 +-
 worker/cgroup.go               | 5 ++++-
 worker/cgroup_test.go          | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tunasync.yml b/.github/workflows/tunasync.yml
index 9608b9d..0ecd562 100644
--- a/.github/workflows/tunasync.yml
+++ b/.github/workflows/tunasync.yml
@@ -63,7 +63,7 @@ jobs:
     - name: Run Additional Unit tests.
       run: |
         make build-test-worker
-        sudo cgexec -g "*:/" -g cpu,memory:tunasync bash -c "echo 0 > /sys/fs/cgroup/systemd/tasks; exec sudo -u $USER env USECURCGROUP=1 ./worker.test -test.v -test.coverprofile profile.cov -test.run TestCgroup"
+        sudo cgexec -g "*:/" bash -c "echo 0 > /sys/fs/cgroup/systemd/tasks; exec sudo -u $USER env USECURCGROUP=1 cgexec -g cpu,memory:tunasync ./worker.test -test.v -test.coverprofile profile.cov -test.run TestCgroup"
 
     - name: Convert coverage to lcov
       uses: jandelgado/gcov2lcov-action@v1.0.0
diff --git a/worker/cgroup.go b/worker/cgroup.go
index e5c2c7f..2f87bd5 100644
--- a/worker/cgroup.go
+++ b/worker/cgroup.go
@@ -167,7 +167,10 @@ func initCgroup(cfg *cgroupConfig) (error) {
 		}
 		logger.Infof("Loading cgroup")
 		var err error
-		if cfg.cgMgrV1, err = cgv1.Load(cgv1.V1, pather); err != nil {
+		if cfg.cgMgrV1, err = cgv1.Load(cgv1.V1, pather, func(cfg *cgv1.InitConfig) error{
+			cfg.InitCheck = cgv1.AllowAny
+			return nil
+		}); err != nil {
 			return err
 		}
 		logger.Debugf("Available subsystems:")
diff --git a/worker/cgroup_test.go b/worker/cgroup_test.go
index b3db44b..db99201 100644
--- a/worker/cgroup_test.go
+++ b/worker/cgroup_test.go
@@ -231,7 +231,10 @@ sleep 30
 						return path, err
 					}
 				})(cgv1.NestedPath(""))
-				wkrMgr, err := cgv1.Load(cgv1.V1, pather)
+				wkrMgr, err := cgv1.Load(cgv1.V1, pather, func(cfg *cgv1.InitConfig) error{
+					cfg.InitCheck = cgv1.AllowAny
+					return nil
+				})
 				So(err, ShouldBeNil)
 				origMgr := cgcf.cgMgrV1
 				for _, subsys := range(wkrMgr.Subsystems()){