diff options
| -rw-r--r-- | executor/common_linux.h | 8 | ||||
| -rw-r--r-- | pkg/csource/generated.go | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/executor/common_linux.h b/executor/common_linux.h index 16880d00e..43fb6c2ce 100644 --- a/executor/common_linux.h +++ b/executor/common_linux.h @@ -3472,8 +3472,12 @@ static void mount_cgroups(const char* dir, const char** controllers, int count) if (enabled[0] == 0) return; // Now mount all at once. - if (mount("none", dir, "cgroup", 0, enabled + 1)) - failmsg("mount cgroup failed", "(%s, %s): %d\n", dir, enabled + 1, errno); + if (mount("none", dir, "cgroup", 0, enabled + 1)) { + // In systemd/stretch images this is failing with EBUSY + // (systemd starts messing with these mounts?), + // so we don't fail, but just log the error. + debug("mount(%s, %s) failed: %d\n", dir, enabled + 1, errno); + } if (chmod(dir, 0777)) { debug("chmod(%s) failed: %d\n", dir, errno); } diff --git a/pkg/csource/generated.go b/pkg/csource/generated.go index 69da1124d..9aad9fefa 100644 --- a/pkg/csource/generated.go +++ b/pkg/csource/generated.go @@ -8119,8 +8119,9 @@ static void mount_cgroups(const char* dir, const char** controllers, int count) } if (enabled[0] == 0) return; - if (mount("none", dir, "cgroup", 0, enabled + 1)) - failmsg("mount cgroup failed", "(%s, %s): %d\n", dir, enabled + 1, errno); + if (mount("none", dir, "cgroup", 0, enabled + 1)) { + debug("mount(%s, %s) failed: %d\n", dir, enabled + 1, errno); + } if (chmod(dir, 0777)) { debug("chmod(%s) failed: %d\n", dir, errno); } |