X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=service.h;h=40bd57e256a4a4ef0295a5c610fb276d4725a9a3;hp=f357fc857e4f3e55fe6d82beda3c7ed9d30397b1;hb=8407a5d0183d9513349754f1eac86e2fdec8bd76;hpb=80876c20f64f87765242bc35895977ab6a855729

diff --git a/service.h b/service.h
index f357fc857..40bd57e25 100644
--- a/service.h
+++ b/service.h
@@ -57,8 +57,9 @@ typedef enum ServiceRestart {
 
 typedef enum ServiceType {
         SERVICE_FORKING,  /* forks by itself (i.e. traditional daemons) */
-        SERVICE_SIMPLE,   /* we fork and go on right-away (i.e. modern socket activated daemons)*/
+        SERVICE_SIMPLE,   /* we fork and go on right-away (i.e. modern socket activated daemons) */
         SERVICE_FINISH,   /* we fork and wait until the program finishes (i.e. programs like fsck which run and need to finish before we continue) */
+        SERVICE_DBUS,     /* we fork and wait until a specific D-Bus name appears on the bus */
         _SERVICE_TYPE_MAX,
         _SERVICE_TYPE_INVALID = -1
 } ServiceType;
@@ -93,30 +94,44 @@ struct Service {
         bool root_directory_start_only;
         bool valid_no_process;
 
-        ServiceState state;
+        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 failure:1; /* if we shut down, remember why */
+        /* If we shut down, remember why */
+        bool failure:1;
+
+        bool bus_name_good:1;
+
+        bool allow_restart:1;
+
+        bool got_socket_fd:1;
 
         bool sysv_has_lsb:1;
         char *sysv_path;
         int sysv_start_priority;
         char *sysv_runlevels;
 
+        char *bus_name;
+
         RateLimit ratelimit;
 
+        int socket_fd;
+
         Watch timer_watch;
 };
 
 extern const UnitVTable service_vtable;
 
+int service_set_socket_fd(Service *s, int fd);
+
 const char* service_state_to_string(ServiceState i);
 ServiceState service_state_from_string(const char *s);