summaryrefslogtreecommitdiff
path: root/src/core/manager.h
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-10-28 01:42:13 +0100
committerLennart Poettering <lennart@poettering.net>2014-10-28 01:42:13 +0100
commitfa1b91632c5220e6589007af4cd573ca909f915a (patch)
tree1fb3c2e97ef5d3072f7a7c56a2b7cd473d4d3498 /src/core/manager.h
parentcea358fe1b600c40670da96e62c9187f0a7c2bed (diff)
core: remove system start timeout logic again
The system start timeout as previously implemented would get confused by long-running services that are included in the initial system startup transaction for example by being cron-job-like long-running services triggered immediately at boot. Such long-running jobs would be subject to the default 15min timeout, esily triggering it. Hence, remove this again. In a subsequent commit, introduce per-target job timeouts instead, that allow us to control these timeouts more finegrained.
Diffstat (limited to 'src/core/manager.h')
-rw-r--r--src/core/manager.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/core/manager.h b/src/core/manager.h
index 8e3c146b42..65821671e7 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -33,8 +33,6 @@
/* Enforce upper limit how many names we allow */
#define MANAGER_MAX_NAMES 131072 /* 128K */
-#define DEFAULT_MANAGER_START_TIMEOUT_USEC (15*USEC_PER_MINUTE)
-
typedef struct Manager Manager;
typedef enum ManagerState {
@@ -284,12 +282,6 @@ struct Manager {
/* Used for processing polkit authorization responses */
Hashmap *polkit_registry;
-
- /* System wide startup timeouts */
- usec_t start_timeout_usec;
- sd_event_source *start_timeout_event_source;
- FailureAction start_timeout_action;
- char *start_timeout_reboot_arg;
};
int manager_new(SystemdRunningAs running_as, bool test_run, Manager **m);