unit: don't show ENOENT configuration file warnings for units that are not essential

[elogind.git] / src / cgroup.c

diff --git a/src/cgroup.c b/src/cgroup.c
index 7397b5298119d156f36dfe2e0724ae7914441861..23ba5d86a9eb84d1278eff582eaf6a4889315986 100644 (file)
--- a/src/cgroup.c
+++ b/src/cgroup.c
@@ -149,7 +149,7 @@ int cgroup_bonding_kill(CGroupBonding *b, int sig) {
 
         assert(b->realized);
 
-        return cg_kill_recursive(b->controller, b->path, sig, true);
+        return cg_kill_recursive(b->controller, b->path, sig, true, false);
 }
 
 int cgroup_bonding_kill_list(CGroupBonding *first, int sig) {
@@ -215,13 +215,7 @@ int manager_setup_cgroup(Manager *m) {
 
         assert(m);
 
-        /* 1. Initialize libcg */
-        if ((r = cg_init()) < 0) {
-                log_error("Failed to initialize libcg: %s", strerror(-r));
-                goto finish;
-        }
-
-        /* 2. Determine hierarchy */
+        /* 1. Determine hierarchy */
         if ((r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 0, &current)) < 0)
                 goto finish;
 
@@ -237,19 +231,19 @@ int manager_setup_cgroup(Manager *m) {
         } else {
                 /* We need a new root cgroup */
                 m->cgroup_hierarchy = NULL;
-                if ((r = asprintf(&m->cgroup_hierarchy, "%s%s", streq(current, "/") ? "" : current, suffix)) < 0) {
+                if (asprintf(&m->cgroup_hierarchy, "%s%s", streq(current, "/") ? "" : current, suffix) < 0) {
                         r = -ENOMEM;
                         goto finish;
                 }
         }
 
-        /* 3. Show data */
+        /* 2. Show data */
         if ((r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_hierarchy, NULL, &path)) < 0)
                 goto finish;
 
         log_debug("Using cgroup controller " SYSTEMD_CGROUP_CONTROLLER ". File system hierarchy is at %s.", path);
 
-        /* 4. Install agent */
+        /* 3. Install agent */
         if ((r = cg_install_release_agent(SYSTEMD_CGROUP_CONTROLLER, CGROUP_AGENT_PATH)) < 0)
                 log_warning("Failed to install release agent, ignoring: %s", strerror(-r));
         else if (r > 0)
@@ -257,13 +251,13 @@ int manager_setup_cgroup(Manager *m) {
         else
                 log_debug("Release agent already installed.");
 
-        /* 5. Realize the group */
+        /* 4. Realize the group */
         if ((r = cg_create_and_attach(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_hierarchy, 0)) < 0) {
                 log_error("Failed to create root cgroup hierarchy: %s", strerror(-r));
                 goto finish;
         }
 
-        /* 6. And pin it, so that it cannot be unmounted */
+        /* 5. And pin it, so that it cannot be unmounted */
         if (m->pin_cgroupfs_fd >= 0)
                 close_nointr_nofail(m->pin_cgroupfs_fd);
 
@@ -331,14 +325,13 @@ int cgroup_notify_empty(Manager *m, const char *group) {
 Unit* cgroup_unit_by_pid(Manager *m, pid_t pid) {
         CGroupBonding *l, *b;
         char *group = NULL;
-        int r;
 
         assert(m);
 
         if (pid <= 1)
                 return NULL;
 
-        if ((r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, pid, &group)))
+        if (cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, pid, &group) < 0)
                 return NULL;
 
         l = hashmap_get(m->cgroup_bondings, group);