X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=manager.h;h=817bc00bc825ac1cd92e9a8a2324405e16965088;hb=37d88da701d75a3893b262580dc59042147a9b89;hp=a361748374a3c2900c9daa9f37bd9ee071aa7f41;hpb=0fd030bea1afa032d9afc791db4165a6848604b8;p=elogind.git

diff --git a/manager.h b/manager.h
index a36174837..817bc00bc 100644
--- a/manager.h
+++ b/manager.h
@@ -82,7 +82,8 @@ struct Watch {
 #define SPECIAL_REMOTE_FS_TARGET "remote-fs.target"
 #define SPECIAL_SYSLOG_TARGET "syslog.target"             /* Should pull in syslog.socket or syslog.service */
 #define SPECIAL_RTC_SET_TARGET "rtc-set.target"           /* LSB's $time */
-#define SPECIAL_SYSINIT_SERVICE "sysinit.service"
+#define SPECIAL_BASIC_TARGET "basic.target"
+#define SPECIAL_RESCUE_TARGET "rescue.target"
 
 /* For SysV compatibility. Usually an alias for a saner target. On
  * SysV-free systems this doesn't exist. */
@@ -125,6 +126,8 @@ struct Manager {
         LIST_HEAD(Meta, dbus_unit_queue);
         LIST_HEAD(Job, dbus_job_queue);
 
+        LIST_HEAD(Meta, cleanup_queue);
+
         /* Jobs to be added */
         Hashmap *transaction_jobs;      /* Unit object => Job object list 1:1 */
         JobDependency *transaction_anchor;
@@ -133,7 +136,7 @@ struct Manager {
         bool dispatching_run_queue:1;
         bool dispatching_dbus_queue:1;
 
-        bool request_bus_dispatch:1;
+        bool request_api_bus_dispatch:1;
         bool request_system_bus_dispatch:1;
 
         Hashmap *watch_pids;  /* pid => Unit object n:1 */
@@ -144,6 +147,7 @@ struct Manager {
 
         char **unit_path;
         char **sysvinit_path;
+        char **sysvrcnd_path;
 
         /* Data specific to the device subsystem */
         struct udev* udev;
@@ -155,7 +159,7 @@ struct Manager {
         Watch mount_watch;
 
         /* Data specific to the D-Bus subsystem */
-        DBusConnection *bus, *system_bus;
+        DBusConnection *api_bus, *system_bus;
         Set *subscribed;
 
         /* Data specific to the cgroup subsystem */
@@ -164,7 +168,7 @@ struct Manager {
         char *cgroup_hierarchy;
 };
 
-int manager_new(Manager **m);
+int manager_new(ManagerRunningAs running_as, Manager **m);
 void manager_free(Manager *m);
 
 int manager_coldplug(Manager *m);
@@ -181,7 +185,7 @@ int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool for
 void manager_dump_units(Manager *s, FILE *f, const char *prefix);
 void manager_dump_jobs(Manager *s, FILE *f, const char *prefix);
 
-void manager_transaction_unlink_job(Manager *m, Job *j);
+void manager_transaction_unlink_job(Manager *m, Job *j, bool delete_dependencies);
 
 void manager_clear_jobs(Manager *m);