chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
service: properly remember if a sysv is actually enabled
[elogind.git]
/
src
/
service.h
diff --git
a/src/service.h
b/src/service.h
index d254044316fe6d0369a57f15f220ec7e49cd1c35..3e18d221d7d0d3122208d7088b6a0dc531dd278a 100644
(file)
--- a/
src/service.h
+++ b/
src/service.h
@@
-90,8
+90,6
@@
struct Service {
ServiceType type;
ServiceRestart restart;
ServiceType type;
ServiceRestart restart;
- NotifyAccess notify_access;
-
/* If set we'll read the main daemon PID from this file */
char *pid_file;
/* If set we'll read the main daemon PID from this file */
char *pid_file;
@@
-101,10
+99,6
@@
struct Service {
ExecCommand* exec_command[_SERVICE_EXEC_COMMAND_MAX];
ExecContext exec_context;
ExecCommand* exec_command[_SERVICE_EXEC_COMMAND_MAX];
ExecContext exec_context;
- bool permissions_start_only;
- bool root_directory_start_only;
- bool valid_no_process;
-
ServiceState state, deserialized_state;
ExecStatus main_exec_status;
ServiceState state, deserialized_state;
ExecStatus main_exec_status;
@@
-112,20
+106,24
@@
struct Service {
ExecCommand *control_command;
ServiceExecCommand control_command_id;
pid_t main_pid, control_pid;
ExecCommand *control_command;
ServiceExecCommand control_command_id;
pid_t main_pid, control_pid;
- bool main_pid_known:1;
+
+ bool permissions_start_only;
+ bool root_directory_start_only;
+ bool valid_no_process;
/* If we shut down, remember why */
bool failure:1;
/* If we shut down, remember why */
bool failure:1;
-
+ bool main_pid_known:1;
bool bus_name_good:1;
bool bus_name_good:1;
-
bool allow_restart:1;
bool allow_restart:1;
-
bool got_socket_fd:1;
bool got_socket_fd:1;
-
bool sysv_has_lsb:1;
bool sysv_has_lsb:1;
- char *sysv_path;
+ bool sysv_enabled:1;
+
+ int socket_fd;
int sysv_start_priority;
int sysv_start_priority;
+
+ char *sysv_path;
char *sysv_runlevels;
char *bus_name;
char *sysv_runlevels;
char *bus_name;
@@
-134,10
+132,11
@@
struct Service {
RateLimit ratelimit;
RateLimit ratelimit;
- int socket_fd;
struct Socket *socket;
Watch timer_watch;
struct Socket *socket;
Watch timer_watch;
+
+ NotifyAccess notify_access;
};
extern const UnitVTable service_vtable;
};
extern const UnitVTable service_vtable;