core: warn and ignore SysVStartPriority=

[elogind.git] / src / core / service.h

diff --git a/src/core/service.h b/src/core/service.h
index 60b10516ebeed8d43657b60dc0a781c39fbc43b9..f6a78c403b6a58eb1a8620d2d9f0d0787f475c15 100644 (file)
--- a/src/core/service.h
+++ b/src/core/service.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 

-#ifndef fooservicehfoo
-#define fooservicehfoo
+#pragma once

 
 /***
   This file is part of systemd.
 
 /***
   This file is part of systemd.


@@ -9,16 +8,16 @@
   Copyright 2010 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
   Copyright 2010 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it

-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or

   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

-  General Public License for more details.
+  Lesser General Public License for more details.

 
 

-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License

   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 


@@ -27,7 +26,9 @@ typedef struct Service Service;
 #include "unit.h"
 #include "path.h"
 #include "ratelimit.h"
 #include "unit.h"
 #include "path.h"
 #include "ratelimit.h"

-#include "service.h"
+#include "kill.h"
+#include "exit-status.h"
+#include "failure-action.h"

 
 typedef enum ServiceState {
         SERVICE_DEAD,
 
 typedef enum ServiceState {
         SERVICE_DEAD,


@@ -38,6 +39,7 @@ typedef enum ServiceState {
         SERVICE_EXITED,            /* Nothing is running anymore, but RemainAfterExit is true hence this is OK */
         SERVICE_RELOAD,
         SERVICE_STOP,              /* No STOP_PRE state, instead just register multiple STOP executables */
         SERVICE_EXITED,            /* Nothing is running anymore, but RemainAfterExit is true hence this is OK */
         SERVICE_RELOAD,
         SERVICE_STOP,              /* No STOP_PRE state, instead just register multiple STOP executables */

+        SERVICE_STOP_SIGABRT,      /* Watchdog timeout */

         SERVICE_STOP_SIGTERM,
         SERVICE_STOP_SIGKILL,
         SERVICE_STOP_POST,
         SERVICE_STOP_SIGTERM,
         SERVICE_STOP_SIGKILL,
         SERVICE_STOP_POST,


@@ -53,6 +55,8 @@ typedef enum ServiceRestart {
         SERVICE_RESTART_NO,
         SERVICE_RESTART_ON_SUCCESS,
         SERVICE_RESTART_ON_FAILURE,
         SERVICE_RESTART_NO,
         SERVICE_RESTART_ON_SUCCESS,
         SERVICE_RESTART_ON_FAILURE,

+        SERVICE_RESTART_ON_ABNORMAL,
+        SERVICE_RESTART_ON_WATCHDOG,

         SERVICE_RESTART_ON_ABORT,
         SERVICE_RESTART_ALWAYS,
         _SERVICE_RESTART_MAX,
         SERVICE_RESTART_ON_ABORT,
         SERVICE_RESTART_ALWAYS,
         _SERVICE_RESTART_MAX,


@@ -65,6 +69,7 @@ typedef enum ServiceType {
         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_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_IDLE,     /* much like simple, but delay exec() until all jobs are dispatched. */

         _SERVICE_TYPE_MAX,
         _SERVICE_TYPE_INVALID = -1
 } ServiceType;
         _SERVICE_TYPE_MAX,
         _SERVICE_TYPE_INVALID = -1
 } ServiceType;


@@ -88,6 +93,15 @@ typedef enum NotifyAccess {
         _NOTIFY_ACCESS_INVALID = -1
 } NotifyAccess;
 
         _NOTIFY_ACCESS_INVALID = -1
 } NotifyAccess;
 

+typedef enum NotifyState {
+        NOTIFY_UNKNOWN,
+        NOTIFY_READY,
+        NOTIFY_RELOADING,
+        NOTIFY_STOPPING,
+        _NOTIFY_STATE_MAX,
+        _NOTIFY_STATE_INVALID = -1
+} NotifyState;
+

 typedef enum ServiceResult {
         SERVICE_SUCCESS,
         SERVICE_FAILURE_RESOURCES,
 typedef enum ServiceResult {
         SERVICE_SUCCESS,
         SERVICE_FAILURE_RESOURCES,


@@ -96,37 +110,36 @@ typedef enum ServiceResult {
         SERVICE_FAILURE_SIGNAL,
         SERVICE_FAILURE_CORE_DUMP,
         SERVICE_FAILURE_WATCHDOG,
         SERVICE_FAILURE_SIGNAL,
         SERVICE_FAILURE_CORE_DUMP,
         SERVICE_FAILURE_WATCHDOG,

+        SERVICE_FAILURE_START_LIMIT,

         _SERVICE_RESULT_MAX,
         _SERVICE_RESULT_INVALID = -1
 } ServiceResult;
 
         _SERVICE_RESULT_MAX,
         _SERVICE_RESULT_INVALID = -1
 } ServiceResult;
 

-typedef enum StartLimitAction {
-        SERVICE_START_LIMIT_NONE,
-        SERVICE_START_LIMIT_REBOOT,
-        SERVICE_START_LIMIT_REBOOT_FORCE,
-        SERVICE_START_LIMIT_REBOOT_IMMEDIATE,
-        _SERVICE_START_LIMIT_MAX,
-        _SERVICE_START_LIMIT_INVALID = -1
-} StartLimitAction;
-

 struct Service {
         Unit meta;
 
         ServiceType type;
         ServiceRestart restart;
 struct Service {
         Unit meta;
 
         ServiceType type;
         ServiceRestart restart;

+        ExitStatusSet restart_prevent_status;
+        ExitStatusSet restart_force_status;
+        ExitStatusSet success_status;

 
         /* If set we'll read the main daemon PID from this file */
         char *pid_file;
 
         usec_t restart_usec;
 
         /* If set we'll read the main daemon PID from this file */
         char *pid_file;
 
         usec_t restart_usec;

-        usec_t timeout_usec;
+        usec_t timeout_start_usec;
+        usec_t timeout_stop_usec;

 
         dual_timestamp watchdog_timestamp;
         usec_t watchdog_usec;
 
         dual_timestamp watchdog_timestamp;
         usec_t watchdog_usec;

-        Watch watchdog_watch;
+        sd_event_source *watchdog_event_source;

 
         ExecCommand* exec_command[_SERVICE_EXEC_COMMAND_MAX];
 
         ExecCommand* exec_command[_SERVICE_EXEC_COMMAND_MAX];

+

         ExecContext exec_context;
         ExecContext exec_context;

+        KillContext kill_context;
+        CGroupContext cgroup_context;

 
         ServiceState state, deserialized_state;
 
 
         ServiceState state, deserialized_state;
 


@@ -144,10 +157,14 @@ struct Service {
         /* The ID of the control command currently being executed */
         ServiceExecCommand control_command_id;
 
         /* The ID of the control command currently being executed */
         ServiceExecCommand control_command_id;
 

+        /* Runtime data of the execution context */
+        ExecRuntime *exec_runtime;
+

         pid_t main_pid, control_pid;
         int socket_fd;
         pid_t main_pid, control_pid;
         int socket_fd;

+        bool socket_fd_selinux_context_net;

 
 

-        int fsck_passno;
+        int bus_endpoint_fd;

 
         bool permissions_start_only;
         bool root_directory_start_only;
 
         bool permissions_start_only;
         bool root_directory_start_only;


@@ -162,59 +179,50 @@ struct Service {
         bool main_pid_alien:1;
         bool bus_name_good:1;
         bool forbid_restart:1;
         bool main_pid_alien: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;
-        int sysv_start_priority_from_rcnd;
-        int sysv_start_priority;
-
-        char *sysv_path;
-        char *sysv_runlevels;
-        usec_t sysv_mtime;
-#endif
+        bool start_timeout_defined:1;

 
         char *bus_name;
 
         char *status_text;
 
         char *bus_name;
 
         char *status_text;

+        int status_errno;

 
         RateLimit start_limit;
 
         RateLimit start_limit;

-        StartLimitAction start_limit_action;
-
+        FailureAction start_limit_action;
+        FailureAction failure_action;
+        char *reboot_arg;

 
         UnitRef accept_socket;
 
 
         UnitRef accept_socket;
 

-        Watch timer_watch;
+        sd_event_source *timer_event_source;

         PathSpec *pid_file_pathspec;
 
         NotifyAccess notify_access;
         PathSpec *pid_file_pathspec;
 
         NotifyAccess notify_access;

+        NotifyState notify_state;

 };
 
 extern const UnitVTable service_vtable;
 
 struct Socket;
 
 };
 
 extern const UnitVTable service_vtable;
 
 struct Socket;
 

-int service_set_socket_fd(Service *s, int fd, struct Socket *socket);
-
-const char* service_state_to_string(ServiceState i);
-ServiceState service_state_from_string(const char *s);
+int service_set_socket_fd(Service *s, int fd, struct Socket *socket, bool selinux_context_net);

 
 

-const char* service_restart_to_string(ServiceRestart i);
-ServiceRestart service_restart_from_string(const char *s);
+const char* service_state_to_string(ServiceState i) _const_;
+ServiceState service_state_from_string(const char *s) _pure_;

 
 

-const char* service_type_to_string(ServiceType i);
-ServiceType service_type_from_string(const char *s);
+const char* service_restart_to_string(ServiceRestart i) _const_;
+ServiceRestart service_restart_from_string(const char *s) _pure_;

 
 

-const char* service_exec_command_to_string(ServiceExecCommand i);
-ServiceExecCommand service_exec_command_from_string(const char *s);
+const char* service_type_to_string(ServiceType i) _const_;
+ServiceType service_type_from_string(const char *s) _pure_;

 
 

-const char* notify_access_to_string(NotifyAccess i);
-NotifyAccess notify_access_from_string(const char *s);
+const char* service_exec_command_to_string(ServiceExecCommand i) _const_;
+ServiceExecCommand service_exec_command_from_string(const char *s) _pure_;

 
 

-const char* service_result_to_string(ServiceResult i);
-ServiceResult service_result_from_string(const char *s);
+const char* notify_access_to_string(NotifyAccess i) _const_;
+NotifyAccess notify_access_from_string(const char *s) _pure_;

 
 

-const char* start_limit_action_to_string(StartLimitAction i);
-StartLimitAction start_limit_action_from_string(const char *s);
+const char* notify_state_to_string(NotifyState i) _const_;
+NotifyState notify_state_from_string(const char *s) _pure_;

 
 

-#endif
+const char* service_result_to_string(ServiceResult i) _const_;
+ServiceResult service_result_from_string(const char *s) _pure_;