chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
umount: simplify code for deactivating loop devices
[elogind.git]
/
src
/
unit.h
diff --git
a/src/unit.h
b/src/unit.h
index a020bd8a0d7421b8273eb4ccfbaac44bdf6290ed..fa869ece8fb7859dbea2def6c055dd1b68632796 100644
(file)
--- a/
src/unit.h
+++ b/
src/unit.h
@@
-38,6
+38,7
@@
typedef enum UnitDependency UnitDependency;
#include "list.h"
#include "socket-util.h"
#include "execute.h"
#include "list.h"
#include "socket-util.h"
#include "execute.h"
+#include "condition.h"
#define DEFAULT_TIMEOUT_USEC (60*USEC_PER_SEC)
#define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
#define DEFAULT_TIMEOUT_USEC (60*USEC_PER_SEC)
#define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
@@
-62,7
+63,7
@@
enum UnitLoadState {
UNIT_LOADED,
UNIT_ERROR,
UNIT_MERGED,
UNIT_LOADED,
UNIT_ERROR,
UNIT_MERGED,
- UNIT_
BANN
ED,
+ UNIT_
MASK
ED,
_UNIT_LOAD_STATE_MAX,
_UNIT_LOAD_STATE_INVALID = -1
};
_UNIT_LOAD_STATE_MAX,
_UNIT_LOAD_STATE_INVALID = -1
};
@@
-154,6
+155,9
@@
struct Meta {
usec_t job_timeout;
usec_t job_timeout;
+ /* Conditions to check */
+ LIST_HEAD(Condition, conditions);
+
dual_timestamp inactive_exit_timestamp;
dual_timestamp active_enter_timestamp;
dual_timestamp active_exit_timestamp;
dual_timestamp inactive_exit_timestamp;
dual_timestamp active_enter_timestamp;
dual_timestamp active_exit_timestamp;
@@
-505,7
+509,7
@@
bool unit_pending_active(Unit *u);
int unit_add_default_target_dependency(Unit *u, Unit *target);
UnitType unit_name_to_type(const char *n);
int unit_add_default_target_dependency(Unit *u, Unit *target);
UnitType unit_name_to_type(const char *n);
-bool unit_name_is_valid(const char *n);
+bool unit_name_is_valid(const char *n
, bool template_ok
);
const char *unit_load_state_to_string(UnitLoadState i);
UnitLoadState unit_load_state_from_string(const char *s);
const char *unit_load_state_to_string(UnitLoadState i);
UnitLoadState unit_load_state_from_string(const char *s);