diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-04-08 11:08:16 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-04-08 11:08:16 +0200 |
| commit | 7b061de2d0601a33f7246c4b909f30ddc44d7ab6 (patch) | |
| tree | 6b6378f2b4a2499b274ca1fd8c154554635e8156 /src/core | |
| parent | 679327ab991edd0a13a0cff335ea5c9c8a7ef705 (diff) | |
Compiling.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/cgroup.c | 3 | ||||
| -rw-r--r-- | src/core/execute.c | 1 | ||||
| -rw-r--r-- | src/core/service.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 6b8abb480..b28137789 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -933,7 +933,8 @@ int manager_setup_cgroup(Manager *m) { /* 3. Install agent */ if (m->running_as == SYSTEMD_SYSTEM) { - r = cg_install_release_agent(SYSTEMD_CGROUP_CONTROLLER, SYSTEMD_CGROUP_AGENT_PATH); + r = -EINVAL; + // cg_install_release_agent(SYSTEMD_CGROUP_CONTROLLER, SYSTEMD_CGROUP_AGENT_PATH); if (r < 0) log_warning_errno(r, "Failed to install release agent, ignoring: %m"); else if (r > 0) diff --git a/src/core/execute.c b/src/core/execute.c index 02df51b5b..027e3319e 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -61,7 +61,6 @@ #include "namespace.h" #include "exit-status.h" #include "missing.h" -#include "utmp-wtmp.h" #include "def.h" #include "path-util.h" #include "env-util.h" diff --git a/src/core/service.c b/src/core/service.c index d9385504e..beaf21340 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -347,7 +347,7 @@ static int service_add_fd_store(Service *s, int fd) { return 0; LIST_FOREACH(fd_store, fs, s->fd_store) { - r = same_fd(fs->fd, fd); + r = -EINVAL; if (r < 0) return r; if (r > 0) { |