X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind.h;h=9be29ab280e183f57ed67da3b4083bc27b98cc82;hp=41b48ef74b8b29fb9704feaf5683f7915ef0356b;hb=6f2f5118f1ba06b7fd93a0ce6661530ea1f7e7ee;hpb=da22b4dccb157393d36cfce6656ddbd9f224f5e3

diff --git a/src/login/logind.h b/src/login/logind.h
index 41b48ef74..9be29ab28 100644
--- a/src/login/logind.h
+++ b/src/login/logind.h
@@ -29,7 +29,6 @@
 #include "sd-bus.h"
 #include "sd-event.h"
 
-#include "cgroup-util.h"
 #include "hashmap.h"
 #include "list.h"
 #include "set.h"
@@ -40,7 +39,14 @@ typedef struct Manager Manager;
 #include "logind-button.h"
 #include "logind-device.h"
 #include "logind-inhibit.h"
-#include "logind-sleep.h"
+
+/// Additional includes needed by elogind
+#include "cgroup-util.h"
+
+#if 1 /// elogind has to ident itself
+#define MANAGER_IS_SYSTEM(m) ((m)->is_system)
+#define MANAGER_IS_USER(m) (!((m)->is_system))
+#endif // 1
 
 struct Manager {
         sd_event *event;
@@ -78,8 +84,13 @@ struct Manager {
          * file system */
         int pin_cgroupfs_fd;
 
+        /* fd for handling cgroup socket if elogind is its own cgroups manager */
+        int cgroups_agent_fd;
+        sd_event_source *cgroups_agent_event_source;
+
         /* Flags */
         bool test_run:1;
+        bool is_system:1; /* true if elogind is its own cgroups manager */
 
         /* Data specific to the cgroup subsystem */
         CGroupMask cgroup_supported;