X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Fcgroup-util.c;h=323c637fe926badb6400e8d983f6bf88bff43cec;hb=acf253bd3b176f711cefb4b53fff29b89a18c7cd;hp=ec2c529914d32168689e2222dc5f504407ecb06b;hpb=d5aacbb6077b4e45fd36fbff6843595aa64d2288;p=elogind.git

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index ec2c52991..323c637fe 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -55,6 +55,7 @@
 #include "stdio-util.h"
 #include "string-table.h"
 #include "string-util.h"
+#include "strv.h"
 #include "unit-name.h"
 #include "user-util.h"
 
@@ -845,7 +846,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) {
         if (r > 0 && streq(controller, SYSTEMD_CGROUP_CONTROLLER)) {
                 r = cg_attach(SYSTEMD_CGROUP_CONTROLLER_LEGACY, path, pid);
                 if (r < 0)
-                        log_warning_errno(r, "Failed to attach %d to compat systemd cgroup %s: %m", pid, path);
+                        log_warning_errno(r, "Failed to attach "PID_FMT" to compat systemd cgroup %s: %m", pid, path);
         }
 
         return 0;
@@ -1003,7 +1004,7 @@ int cg_get_xattr(const char *controller, const char *path, const char *name, voi
 int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
         _cleanup_fclose_ FILE *f = NULL;
         char line[LINE_MAX];
-        const char *fs, *controller_str;
+        const char *fs, *controller_str = NULL;
         size_t cs = 0;
         int unified;
 
@@ -1087,6 +1088,7 @@ int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
         return -ENODATA;
 }
 
+#if 0 /// UNNEEDED by elogind
 int cg_install_release_agent(const char *controller, const char *agent) {
         _cleanup_free_ char *fs = NULL, *contents = NULL;
         const char *sc;
@@ -1109,6 +1111,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
                 return r;
 
         sc = strstrip(contents);
+
         if (isempty(sc)) {
                 r = write_string_file(fs, agent, 0);
                 if (r < 0)
@@ -1171,6 +1174,7 @@ int cg_uninstall_release_agent(const char *controller) {
 
         return 0;
 }
+#endif // 0
 
 int cg_is_empty(const char *controller, const char *path) {
         _cleanup_fclose_ FILE *f = NULL;
@@ -1359,7 +1363,6 @@ int cg_mangle_path(const char *path, char **result) {
 }
 
 int cg_get_root_path(char **path) {
-#if 0 /// elogind does not support systemd scopes and slices
         char *p, *e;
         int r;
 
@@ -1369,20 +1372,20 @@ int cg_get_root_path(char **path) {
         if (r < 0)
                 return r;
 
+#if 0 /// elogind does not support systemd scopes and slices
         e = endswith(p, "/" SPECIAL_INIT_SCOPE);
         if (!e)
                 e = endswith(p, "/" SPECIAL_SYSTEM_SLICE); /* legacy */
         if (!e)
                 e = endswith(p, "/system"); /* even more legacy */
+#else
+        e = endswith(p, "/elogind");
+#endif // 0
         if (e)
                 *e = 0;
 
         *path = p;
         return 0;
-#else
-        assert(path);
-        return cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, 1, path);
-#endif // 0
 }
 
 int cg_shift_path(const char *cgroup, const char *root, const char **shifted) {