chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
utmp: enable systemd-update-utmp by default
[elogind.git]
/
src
/
unit.h
diff --git
a/src/unit.h
b/src/unit.h
index f1171270f8adcc5721018a513802a0d9dde727db..82ef95245185121404bd2d0b49157aeccb990441 100644
(file)
--- a/
src/unit.h
+++ b/
src/unit.h
@@
-108,7
+108,8
@@
enum UnitDependency {
UNIT_WANTED_BY, /* inverse of 'wants' */
/* Negative dependencies */
UNIT_WANTED_BY, /* inverse of 'wants' */
/* Negative dependencies */
- UNIT_CONFLICTS, /* inverse of 'conflicts' is 'conflicts' */
+ UNIT_CONFLICTS, /* inverse of 'conflicts' is 'conflicted_by' */
+ UNIT_CONFLICTED_BY,
/* Order */
UNIT_BEFORE, /* inverse of 'before' is 'after' and vice versa */
/* Order */
UNIT_BEFORE, /* inverse of 'before' is 'after' and vice versa */
@@
-176,9
+177,6
@@
struct Meta {
/* GC queue */
LIST_FIELDS(Meta, gc_queue);
/* GC queue */
LIST_FIELDS(Meta, gc_queue);
- /* This follows another unit in state */
- Unit *following;
-
/* Used during GC sweeps */
unsigned gc_marker;
/* Used during GC sweeps */
unsigned gc_marker;
@@
-188,15
+186,18
@@
struct Meta {
/* Garbage collect us we nobody wants or requires us anymore */
bool stop_when_unneeded;
/* Garbage collect us we nobody wants or requires us anymore */
bool stop_when_unneeded;
- /* Refuse manual starting, allow starting only indirectly via dependency. */
- bool only_by_dependency;
-
/* Create default depedencies */
bool default_dependencies;
/* Bring up this unit even if a dependency fails to start */
bool ignore_dependency_failure;
/* Create default depedencies */
bool default_dependencies;
/* Bring up this unit even if a dependency fails to start */
bool ignore_dependency_failure;
+ /* Refuse manual starting, allow starting only indirectly via dependency. */
+ bool refuse_manual_start;
+
+ /* Don't allow the user to stop this unit manually, allow stopping only indirectly via dependency. */
+ bool refuse_manual_stop;
+
/* When deserializing, temporarily store the job type for this
* unit here, if there was a job scheduled */
int deserialized_job; /* This is actually of type JobType */
/* When deserializing, temporarily store the job type for this
* unit here, if there was a job scheduled */
int deserialized_job; /* This is actually of type JobType */
@@
-207,6
+208,10
@@
struct Meta {
bool in_gc_queue:1;
bool sent_dbus_new_signal:1;
bool in_gc_queue:1;
bool sent_dbus_new_signal:1;
+
+ bool no_gc:1;
+
+ bool in_audit:1;
};
#include "service.h"
};
#include "service.h"
@@
-313,6
+318,9
@@
struct UnitVTable {
/* Called for each message received on the bus */
DBusHandlerResult (*bus_message_handler)(Unit *u, DBusConnection *c, DBusMessage *message);
/* Called for each message received on the bus */
DBusHandlerResult (*bus_message_handler)(Unit *u, DBusConnection *c, DBusMessage *message);
+ /* Return the unit this unit is following */
+ Unit *(*following)(Unit *u);
+
/* This is called for each unit type and should be used to
* enumerate existing devices and load them. However,
* everything that is loaded here should still stay in
/* This is called for each unit type and should be used to
* enumerate existing devices and load them. However,
* everything that is loaded here should still stay in
@@
-475,6
+483,8
@@
bool unit_need_daemon_reload(Unit *u);
void unit_reset_maintenance(Unit *u);
void unit_reset_maintenance(Unit *u);
+Unit *unit_following(Unit *u);
+
const char *unit_type_to_string(UnitType i);
UnitType unit_type_from_string(const char *s);
const char *unit_type_to_string(UnitType i);
UnitType unit_type_from_string(const char *s);