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: ignore missing /proc/swaps
[elogind.git]
/
src
/
service.h
diff --git
a/src/service.h
b/src/service.h
index 3a033929fbae45526b1d80a5948ca906224c4960..e28f74b8988c221a9c5eb690424ad635dd2fc2e3 100644
(file)
--- a/
src/service.h
+++ b/
src/service.h
@@
-33,7
+33,7
@@
typedef enum ServiceState {
SERVICE_START,
SERVICE_START_POST,
SERVICE_RUNNING,
SERVICE_START,
SERVICE_START_POST,
SERVICE_RUNNING,
- SERVICE_EXITED, /* Nothing is running anymore, but
ValidNoProcess is true, eh
nce this is OK */
+ SERVICE_EXITED, /* Nothing is running anymore, but
RemainAfterExit is true he
nce this is OK */
SERVICE_RELOAD,
SERVICE_STOP, /* No STOP_PRE state, instead just register multiple STOP executables */
SERVICE_STOP_SIGTERM,
SERVICE_RELOAD,
SERVICE_STOP, /* No STOP_PRE state, instead just register multiple STOP executables */
SERVICE_STOP_SIGTERM,
@@
-41,15
+41,17
@@
typedef enum ServiceState {
SERVICE_STOP_POST,
SERVICE_FINAL_SIGTERM, /* In case the STOP_POST executable hangs, we shoot that down, too */
SERVICE_FINAL_SIGKILL,
SERVICE_STOP_POST,
SERVICE_FINAL_SIGTERM, /* In case the STOP_POST executable hangs, we shoot that down, too */
SERVICE_FINAL_SIGKILL,
- SERVICE_
MAINTENANCE
,
+ SERVICE_
FAILED
,
SERVICE_AUTO_RESTART,
_SERVICE_STATE_MAX,
_SERVICE_STATE_INVALID = -1
} ServiceState;
typedef enum ServiceRestart {
SERVICE_AUTO_RESTART,
_SERVICE_STATE_MAX,
_SERVICE_STATE_INVALID = -1
} ServiceState;
typedef enum ServiceRestart {
- SERVICE_
ONCE
,
+ SERVICE_
RESTART_NO
,
SERVICE_RESTART_ON_SUCCESS,
SERVICE_RESTART_ON_SUCCESS,
+ SERVICE_RESTART_ON_FAILURE,
+ SERVICE_RESTART_ON_ABORT,
SERVICE_RESTART_ALWAYS,
_SERVICE_RESTART_MAX,
_SERVICE_RESTART_INVALID = -1
SERVICE_RESTART_ALWAYS,
_SERVICE_RESTART_MAX,
_SERVICE_RESTART_INVALID = -1
@@
-101,30
+103,49
@@
struct Service {
ServiceState state, deserialized_state;
ServiceState state, deserialized_state;
+ /* The exit status of the real main process */
ExecStatus main_exec_status;
ExecStatus main_exec_status;
+ /* The currently executed control process */
ExecCommand *control_command;
ExecCommand *control_command;
+
+ /* The currently executed main process, which may be NULL if
+ * the main process got started via forking mode and not by
+ * us */
+ ExecCommand *main_command;
+
+ /* The ID of the control command currently being executed */
ServiceExecCommand control_command_id;
ServiceExecCommand control_command_id;
+
pid_t main_pid, control_pid;
pid_t main_pid, control_pid;
+ int socket_fd;
+
+ int fsck_passno;
bool permissions_start_only;
bool root_directory_start_only;
bool permissions_start_only;
bool root_directory_start_only;
- bool valid_no_process;
+ bool remain_after_exit;
+ bool guess_main_pid;
/* If we shut down, remember why */
bool failure:1;
/* If we shut down, remember why */
bool failure:1;
+ bool reload_failure:1;
+
bool main_pid_known:1;
bool main_pid_known:1;
+ bool main_pid_alien:1;
bool bus_name_good:1;
bool forbid_restart:1;
bool got_socket_fd:1;
bool bus_name_good:1;
bool forbid_restart:1;
bool got_socket_fd:1;
+#ifdef HAVE_SYSV_COMPAT
bool sysv_has_lsb:1;
bool sysv_enabled:1;
bool sysv_has_lsb:1;
bool sysv_enabled:1;
-
- int socket_fd;
+ int sysv_start_priority_from_rcnd;
int sysv_start_priority;
char *sysv_path;
char *sysv_runlevels;
int sysv_start_priority;
char *sysv_path;
char *sysv_runlevels;
+ usec_t sysv_mtime;
+#endif
char *bus_name;
char *bus_name;
@@
-132,7
+153,8
@@
struct Service {
RateLimit ratelimit;
RateLimit ratelimit;
- struct Socket *socket;
+ struct Socket *accept_socket;
+ Set *configured_sockets;
Watch timer_watch;
Watch timer_watch;