X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=manager.h;h=3ae8126f90738af4827723a7d1ae697641ffb60e;hp=39be0dc887cff1444c5db19d0112a7f01370bfd7;hb=e24067c3ec0e16e94e9620d4f7a06ccc4b637eb4;hpb=a5dab5ce0fd4aafc394afe30eda0e6b01a13256b diff --git a/manager.h b/manager.h index 39be0dc88..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,7 +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_SYSINIT_SERVICE "sysinit.service" +#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. */ @@ -138,6 +145,8 @@ struct Manager { 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; @@ -146,6 +155,7 @@ struct Manager { char **unit_path; char **sysvinit_path; + char **sysvrcnd_path; /* Data specific to the device subsystem */ struct udev* udev; @@ -164,6 +174,8 @@ struct Manager { Hashmap *cgroup_bondings; /* path string => CGroupBonding object 1:n */ char *cgroup_controller; char *cgroup_hierarchy; + + usec_t boot_timestamp; }; int manager_new(ManagerRunningAs running_as, Manager **m); @@ -196,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