systemctl: add --sysv-compat

[elogind.git] / src / service.h

diff --git a/src/service.h b/src/service.h
index 0ddaaa4c2def37d33f99983ac4808b0613f580f5..0fdcb62d540fc309e45cd5cb6675dc205d99c919 100644 (file)
--- a/src/service.h
+++ b/src/service.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef fooservicehfoo
 #define fooservicehfoo
@@ -33,7 +33,7 @@ typedef enum ServiceState {
         SERVICE_START,
         SERVICE_START_POST,
         SERVICE_RUNNING,
-        SERVICE_EXITED,            /* Nothing is running anymore, but ValidNoProcess is true, ehnce this is OK */
+        SERVICE_EXITED,            /* Nothing is running anymore, but RemainAfterExit is true, ehnce this is OK */
         SERVICE_RELOAD,
         SERVICE_STOP,              /* No STOP_PRE state, instead just register multiple STOP executables */
         SERVICE_STOP_SIGTERM,
@@ -58,7 +58,7 @@ typedef enum ServiceRestart {
 typedef enum ServiceType {
         SERVICE_SIMPLE,   /* we fork and go on right-away (i.e. modern socket activated daemons) */
         SERVICE_FORKING,  /* forks by itself (i.e. traditional 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_ONESHOT,  /* 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_NOTIFY,   /* we fork and wait until a daemon sends us a ready message with sd_notify() */
         _SERVICE_TYPE_MAX,
@@ -109,20 +109,16 @@ struct Service {
 
         bool permissions_start_only;
         bool root_directory_start_only;
-        bool valid_no_process;
-
-        bool main_pid_known:1;
+        bool remain_after_exit;
 
         /* 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;
+        bool sysv_enabled:1;
 
         int socket_fd;
         int sysv_start_priority;