sd-login: update machine enumeration/notifications APIs for new /run/systemd/machines/

diff --git a/TODO b/TODO
index f0af723d0829a3cb2152aa1e53e3c99acbdbed71..0b4048bf70bdbb5546b37a65241c564f76858eb2 100644 (file)
--- a/TODO
+++ b/TODO
@@ -44,7 +44,7 @@ Features:
   RUNNING/LISTENING states of its socket
 
 * slices:
-  - add option to pam_systemd to move login session into a slice
+  - add option to pam_systemd to move login session into a slice (?)
   - remove ControlGroup= setting
   - in sd_pid_get_owner_uid() fallback to query session file
   - add api to determine slice of unit

diff --git a/src/login/sd-login.c b/src/login/sd-login.c
index d2e95034e1388987637ac66ee8f153ae7b2d833a..875d134efcc0aa70befd417ed7476f1ab6c6c6e6 100644 (file)
--- a/src/login/sd-login.c
+++ b/src/login/sd-login.c
@@ -592,40 +592,7 @@ _public_ int sd_get_uids(uid_t **users) {
 }
 
 _public_ int sd_get_machine_names(char ***machines) {
-        _cleanup_closedir_ DIR *d = NULL;
-        _cleanup_strv_free_ char **l = NULL;
-        _cleanup_free_ char *md = NULL;
-        char *n;
-        int c = 0, r;
-
-        r = cg_get_root_path(&md);
-        if (r < 0)
-                return r;
-
-        r = cg_enumerate_subgroups(SYSTEMD_CGROUP_CONTROLLER, md, &d);
-        if (r < 0)
-                return r;
-
-        while ((r = cg_read_subgroup(d, &n)) > 0) {
-
-                r = strv_push(&l, n);
-                if (r < 0) {
-                        free(n);
-                        return -ENOMEM;
-                }
-
-                c++;
-        }
-
-        if (r < 0)
-                return r;
-
-        if (machines) {
-                *machines = l;
-                l = NULL;
-        }
-
-        return c;
+        return get_files_in_directory("/run/systemd/machines/", machines);
 }
 
 static inline int MONITOR_TO_FD(sd_login_monitor *m) {
@@ -678,18 +645,7 @@ _public_ int sd_login_monitor_new(const char *category, sd_login_monitor **m) {
         }
 
         if (!category || streq(category, "machine")) {
-                _cleanup_free_ char *md = NULL, *p = NULL;
-                int r;
-
-                r = cg_get_root_path(&md);
-                if (r < 0)
-                        return r;
-
-                r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, md, NULL, &p);
-                if (r < 0)
-                        return r;
-
-                k = inotify_add_watch(fd, p, IN_MOVED_TO|IN_CREATE|IN_DELETE);
+                k = inotify_add_watch(fd, "/run/systemd/machines/", IN_MOVED_TO|IN_DELETE);
                 if (k < 0) {
                         close_nointr_nofail(fd);
                         return -errno;