X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=manager.h;h=3ae8126f90738af4827723a7d1ae697641ffb60e;hp=8d46323e0e6a42706781bf31a35d93ab6fc321f2;hb=e24067c3ec0e16e94e9620d4f7a06ccc4b637eb4;hpb=8e27452380193a5f81bfd08a59aab8b07008ba0b

diff --git a/manager.h b/manager.h
index 8d46323e0..3ae8126f9 100644
--- a/manager.h
+++ b/manager.h
@@ -70,8 +70,6 @@ struct Watch {
 #include "dbus.h"
 
 #define SPECIAL_DEFAULT_TARGET "default.target"
-#define SPECIAL_SYSLOG_SERVICE "syslog.service"
-#define SPECIAL_DBUS_SERVICE "messagebus.service"
 #define SPECIAL_LOGGER_SOCKET "systemd-logger.socket"
 #define SPECIAL_KBREQUEST_TARGET "kbrequest.target"
 #define SPECIAL_CTRL_ALT_DEL_TARGET "ctrl-alt-del.target"
@@ -82,6 +80,16 @@ 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_BASIC_TARGET "basic.target"
+#define SPECIAL_RESCUE_TARGET "rescue.target"
+
+#ifndef SPECIAL_DBUS_SERVICE
+#define SPECIAL_DBUS_SERVICE "dbus.service"
+#endif
+
+#ifndef SPECIAL_SYSLOG_SERVICE
+#define SPECIAL_SYSLOG_SERVICE "syslog.service"
+#endif
 
 /* For SysV compatibility. Usually an alias for a saner target. On
  * SysV-free systems this doesn't exist. */
@@ -124,6 +132,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;
@@ -132,9 +142,11 @@ 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;
 
+        bool utmp_reboot_written:1;
+
         Hashmap *watch_pids;  /* pid => Unit object n:1 */
 
         int epoll_fd;
@@ -143,6 +155,7 @@ struct Manager {
 
         char **unit_path;
         char **sysvinit_path;
+        char **sysvrcnd_path;
 
         /* Data specific to the device subsystem */
         struct udev* udev;
@@ -154,16 +167,18 @@ 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 */
         Hashmap *cgroup_bondings; /* path string => CGroupBonding object 1:n */
         char *cgroup_controller;
         char *cgroup_hierarchy;
+
+        usec_t boot_timestamp;
 };
 
-int manager_new(Manager **m);
+int manager_new(ManagerRunningAs running_as, Manager **m);
 void manager_free(Manager *m);
 
 int manager_coldplug(Manager *m);
@@ -180,7 +195,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);
 
@@ -193,4 +208,8 @@ int manager_loop(Manager *m);
 const char *manager_running_as_to_string(ManagerRunningAs i);
 ManagerRunningAs manager_running_as_from_string(const char *s);
 
+void manager_write_utmp_reboot(Manager *m);
+
+void manager_write_utmp_runlevel(Manager *m, Unit *t);
+
 #endif