chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: install rules file that ignore those nasty useless tty devices by default
[elogind.git]
/
manager.h
diff --git
a/manager.h
b/manager.h
index 817bc00bc825ac1cd92e9a8a2324405e16965088..3ae8126f90738af4827723a7d1ae697641ffb60e 100644
(file)
--- a/
manager.h
+++ b/
manager.h
@@
-70,8
+70,6
@@
struct Watch {
#include "dbus.h"
#define SPECIAL_DEFAULT_TARGET "default.target"
#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"
#define SPECIAL_LOGGER_SOCKET "systemd-logger.socket"
#define SPECIAL_KBREQUEST_TARGET "kbrequest.target"
#define SPECIAL_CTRL_ALT_DEL_TARGET "ctrl-alt-del.target"
@@
-85,6
+83,14
@@
struct Watch {
#define SPECIAL_BASIC_TARGET "basic.target"
#define SPECIAL_RESCUE_TARGET "rescue.target"
#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. */
#define SPECIAL_RUNLEVEL0_TARGET "runlevel0.target"
/* For SysV compatibility. Usually an alias for a saner target. On
* SysV-free systems this doesn't exist. */
#define SPECIAL_RUNLEVEL0_TARGET "runlevel0.target"
@@
-139,6
+145,8
@@
struct Manager {
bool request_api_bus_dispatch:1;
bool request_system_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;
Hashmap *watch_pids; /* pid => Unit object n:1 */
int epoll_fd;
@@
-166,6
+174,8
@@
struct Manager {
Hashmap *cgroup_bondings; /* path string => CGroupBonding object 1:n */
char *cgroup_controller;
char *cgroup_hierarchy;
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);
};
int manager_new(ManagerRunningAs running_as, Manager **m);
@@
-198,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);
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
#endif