diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2018-06-06 07:37:14 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2018-06-28 09:24:07 +0200 |
| commit | 68a7eea0b2fbe7d80e8ab53772f0812e5360ef6d (patch) | |
| tree | 2461cc598cb58cbfd89ef0734d96a5f72d1f48aa | |
| parent | 8392491e120ade3e60d06ca805ccb393295b5f51 (diff) | |
Prep v238: Mask cg_trim() call in manager_shutdown_cgroup() as elogind is not init.
| -rw-r--r-- | src/basic/macro.h | 1 | ||||
| -rw-r--r-- | src/core/cgroup.c | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/basic/macro.h b/src/basic/macro.h index 1c64ea195..3a6fc6f58 100644 --- a/src/basic/macro.h +++ b/src/basic/macro.h @@ -423,7 +423,6 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) { #endif #endif -#else #define DEFINE_TRIVIAL_CLEANUP_FUNC(type, func) \ static inline void func##p(type *p) { \ if (*p) \ diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 1dd17d3e7..7c590a661 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -2310,16 +2310,16 @@ int manager_setup_cgroup(Manager *m) { #endif // 0 log_debug_elogind("Created control group \"%s\"", scope_path); -#if 0 /// elogind is not a "sub-controller" like systemd, so migration is not needed. -#endif // 0 /* 6. And pin it, so that it cannot be unmounted */ safe_close(m->pin_cgroupfs_fd); m->pin_cgroupfs_fd = open(path, O_RDONLY|O_CLOEXEC|O_DIRECTORY|O_NOCTTY|O_NONBLOCK); if (m->pin_cgroupfs_fd < 0) return log_error_errno(errno, "Failed to open pin file: %m"); +#if 0 /// this is from the cgroup migration above that elogind does not need. } else if (r < 0 && !m->test_run_flags) return log_error_errno(r, "Failed to create %s control group: %m", scope_path); +#endif // 0 /* 7. Always enable hierarchical support if it exists... */ if (!all_unified && m->test_run_flags == 0) @@ -2338,12 +2338,12 @@ int manager_setup_cgroup(Manager *m) { void manager_shutdown_cgroup(Manager *m, bool delete) { assert(m); +#if 0 /// elogind is not init /* We can't really delete the group, since we are in it. But * let's trim it. */ if (delete && m->cgroup_root && m->test_run_flags != MANAGER_TEST_RUN_MINIMAL) (void) cg_trim(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root, false); -#if 0 /// elogind is not init m->cgroup_empty_event_source = sd_event_source_unref(m->cgroup_empty_event_source); m->cgroup_inotify_wd_unit = hashmap_free(m->cgroup_inotify_wd_unit); |