Merge pull request #314 from glorpen/openrc

Skip Systemd cgroup creation on systems with OpenRC
concourse · Dec 4, 2020 · babf5a7 · babf5a7
2 parents d3b9610 + 490674a
commit babf5a7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/assets/common.sh b/assets/common.sh
@@ -41,7 +41,7 @@ sanitize_cgroups() {
     fi
   done
 
-  if ! test -e /sys/fs/cgroup/systemd ; then
+  if [ ! -e /sys/fs/cgroup/systemd ] && [ $(cat /proc/self/cgroup | grep '^1:name=openrc:' | wc -l) -eq 0 ]; then
     mkdir /sys/fs/cgroup/systemd
     mount -t cgroup -o none,name=systemd none /sys/fs/cgroup/systemd
   fi