chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shutdown: respect the dry run option '-k'
[elogind.git]
/
src
/
unit.h
diff --git
a/src/unit.h
b/src/unit.h
index 9b7eb5e854ca3c8bc0c59336f7418734e24e2760..79f15103baaf65cba3c1db22ebf9c1495d27927f 100644
(file)
--- a/
src/unit.h
+++ b/
src/unit.h
@@
-40,9
+40,6
@@
typedef enum UnitDependency UnitDependency;
#include "execute.h"
#include "condition.h"
#include "execute.h"
#include "condition.h"
-#define DEFAULT_TIMEOUT_USEC (3*USEC_PER_MINUTE)
-#define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
-
enum UnitType {
UNIT_SERVICE = 0,
UNIT_SOCKET,
enum UnitType {
UNIT_SERVICE = 0,
UNIT_SOCKET,
@@
-171,7
+168,7
@@
struct Meta {
CGroupBonding *cgroup_bondings;
/* Per type list */
CGroupBonding *cgroup_bondings;
/* Per type list */
- LIST_FIELDS(Meta, units_
per
_type);
+ LIST_FIELDS(Meta, units_
by
_type);
/* Load queue */
LIST_FIELDS(Meta, load_queue);
/* Load queue */
LIST_FIELDS(Meta, load_queue);
@@
-210,6
+207,15
@@
struct Meta {
/* Allow isolation requests */
bool allow_isolate;
/* Allow isolation requests */
bool allow_isolate;
+ /* Isolate OnFailure unit */
+ bool on_failure_isolate;
+
+ /* Ignore this unit when isolating */
+ bool ignore_on_isolate;
+
+ /* Ignore this unit when snapshotting */
+ bool ignore_on_snapshot;
+
/* Did the last condition check suceed? */
bool condition_result;
/* Did the last condition check suceed? */
bool condition_result;
@@
-311,6
+317,9
@@
struct UnitVTable {
void (*sigchld_event)(Unit *u, pid_t pid, int code, int status);
void (*timer_event)(Unit *u, uint64_t n_elapsed, Watch *w);
void (*sigchld_event)(Unit *u, pid_t pid, int code, int status);
void (*timer_event)(Unit *u, uint64_t n_elapsed, Watch *w);
+ /* Check whether unit needs a daemon reload */
+ bool (*need_daemon_reload)(Unit *u);
+
/* Reset failed state if we are in failed state */
void (*reset_failed)(Unit *u);
/* Reset failed state if we are in failed state */
void (*reset_failed)(Unit *u);
@@
-361,15
+370,9
@@
struct UnitVTable {
/* Instances make no sense for this type */
bool no_instances:1;
/* Instances make no sense for this type */
bool no_instances:1;
- /* Exclude this type from snapshots */
- bool no_snapshots:1;
-
/* Exclude from automatic gc */
bool no_gc:1;
/* Exclude from automatic gc */
bool no_gc:1;
- /* Exclude from stopping on isolation requests */
- bool no_isolate:1;
-
/* Show status updates on the console */
bool show_status:1;
};
/* Show status updates on the console */
bool show_status:1;
};