X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fservice.h;h=725e2135f156cbd02a78ff497e03bce8496f2afb;hb=47342320a097523d93040cdd627e237a420572c5;hp=6c1612d0f5abb53c43a8010a6bf901537e244269;hpb=6cf6bbc2682c6df010d64ea7e49d93affa7282cd;p=elogind.git

diff --git a/src/service.h b/src/service.h
index 6c1612d0f..725e2135f 100644
--- a/src/service.h
+++ b/src/service.h
@@ -90,8 +90,6 @@ struct Service {
         ServiceType type;
         ServiceRestart restart;
 
-        NotifyAccess notify_access;
-
         /* If set we'll read the main daemon PID from this file */
         char *pid_file;
 
@@ -101,33 +99,31 @@ struct Service {
         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;
 
-        KillMode kill_mode;
-
         ExecStatus main_exec_status;
 
         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;
-
+        bool main_pid_known:1;
         bool bus_name_good:1;
-
-        bool allow_restart:1;
-
+        bool forbid_restart:1;
         bool got_socket_fd:1;
-
         bool sysv_has_lsb:1;
-        char *sysv_path;
+        bool sysv_enabled:1;
+
+        int socket_fd;
         int sysv_start_priority;
+
+        char *sysv_path;
         char *sysv_runlevels;
 
         char *bus_name;
@@ -136,10 +132,11 @@ struct Service {
 
         RateLimit ratelimit;
 
-        int socket_fd;
         struct Socket *socket;
 
         Watch timer_watch;
+
+        NotifyAccess notify_access;
 };
 
 extern const UnitVTable service_vtable;