chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
machine-id: typo fix
[elogind.git]
/
src
/
unit.h
diff --git
a/src/unit.h
b/src/unit.h
index 9eda138fb7cbadef18cf57540ab329285c932a92..5f55a89da8d7f456181b2df90347689ad1369c9a 100644
(file)
--- a/
src/unit.h
+++ b/
src/unit.h
@@
-40,7
+40,7
@@
typedef enum UnitDependency UnitDependency;
#include "execute.h"
#include "condition.h"
#include "execute.h"
#include "condition.h"
-#define DEFAULT_TIMEOUT_USEC (
60*USEC_PER_SEC
)
+#define DEFAULT_TIMEOUT_USEC (
3*USEC_PER_MINUTE
)
#define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
enum UnitType {
#define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
enum UnitType {
@@
-196,7
+196,7
@@
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;
- /* Create default depedencies */
+ /* Create default depe
n
dencies */
bool default_dependencies;
/* Refuse manual starting, allow starting only indirectly via dependency. */
bool default_dependencies;
/* Refuse manual starting, allow starting only indirectly via dependency. */
@@
-290,7
+290,7
@@
struct UnitVTable {
/* Returns the substate specific to this unit type as
* string. This is purely information so that we can give the
/* Returns the substate specific to this unit type as
* string. This is purely information so that we can give the
- * user a more finegrained explanation in which actual state a
+ * user a more fine
grained explanation in which actual state a
* unit is in. */
const char* (*sub_state_to_string)(Unit *u);
* unit is in. */
const char* (*sub_state_to_string)(Unit *u);
@@
-456,7
+456,7
@@
int unit_reload(Unit *u);
int unit_kill(Unit *u, KillWho w, KillMode m, int signo, DBusError *error);
int unit_kill(Unit *u, KillWho w, KillMode m, int signo, DBusError *error);
-void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns);
+void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns
, bool reload_success
);
int unit_watch_fd(Unit *u, int fd, uint32_t events, Watch *w);
void unit_unwatch_fd(Unit *u, Watch *w);
int unit_watch_fd(Unit *u, int fd, uint32_t events, Watch *w);
void unit_unwatch_fd(Unit *u, Watch *w);
@@
-511,6
+511,8
@@
int unit_following_set(Unit *u, Set **s);
UnitType unit_name_to_type(const char *n);
bool unit_name_is_valid(const char *n, bool template_ok);
UnitType unit_name_to_type(const char *n);
bool unit_name_is_valid(const char *n, bool template_ok);
+void unit_trigger_on_failure(Unit *u);
+
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);