From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 5 Oct 2017 12:42:29 +0000 (+0200)
Subject: Merge pull request #6931 from poettering/job-timeout-sec
X-Git-Tag: v235~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c05f3c8ff8961c1431014b684586df3c9fbf791b;p=thirdparty%2Fsystemd.git

Merge pull request #6931 from poettering/job-timeout-sec
---

c05f3c8ff8961c1431014b684586df3c9fbf791b
diff --cc src/core/load-fragment.c
index 46041de5424,632b7d774dd..a4e39a84eab
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@@ -4145,6 -4145,78 +4145,78 @@@ int config_parse_protect_system
  
  DEFINE_CONFIG_PARSE_ENUM(config_parse_exec_keyring_mode, exec_keyring_mode, ExecKeyringMode, "Failed to parse keyring mode");
  
+ int config_parse_job_timeout_sec(
+                 const char* unit,
+                 const char *filename,
+                 unsigned line,
+                 const char *section,
+                 unsigned section_line,
+                 const char *lvalue,
+                 int ltype,
+                 const char *rvalue,
+                 void *data,
+                 void *userdata) {
+ 
+         Unit *u = data;
+         usec_t usec;
+         int r;
+ 
+         assert(filename);
+         assert(lvalue);
+         assert(rvalue);
+         assert(u);
+ 
+         r = parse_sec_fix_0(rvalue, &usec);
+         if (r < 0) {
+                 log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse JobTimeoutSec= parameter, ignoring: %s", rvalue);
+                 return 0;
+         }
+ 
+         /* If the user explicitly changed JobTimeoutSec= also change JobRunningTimeoutSec=, for compatibility with old
 -         * versions. If JobRunningTimeoutSec= was explicitly set, avoid this however as whatever the usec picked should
++         * versions. If JobRunningTimeoutSec= was explicitly set, avoid this however as whatever the user picked should
+          * count. */
+ 
+         if (!u->job_running_timeout_set)
+                 u->job_running_timeout = usec;
+ 
+         u->job_timeout = usec;
+ 
+         return 0;
+ }
+ 
+ int config_parse_job_running_timeout_sec(
+                 const char* unit,
+                 const char *filename,
+                 unsigned line,
+                 const char *section,
+                 unsigned section_line,
+                 const char *lvalue,
+                 int ltype,
+                 const char *rvalue,
+                 void *data,
+                 void *userdata) {
+ 
+         Unit *u = data;
+         usec_t usec;
+         int r;
+ 
+         assert(filename);
+         assert(lvalue);
+         assert(rvalue);
+         assert(u);
+ 
+         r = parse_sec_fix_0(rvalue, &usec);
+         if (r < 0) {
+                 log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse JobRunningTimeoutSec= parameter, ignoring: %s", rvalue);
+                 return 0;
+         }
+ 
+         u->job_running_timeout = usec;
+         u->job_running_timeout_set = true;
+ 
+         return 0;
+ }
+ 
  #define FOLLOW_MAX 8
  
  static int open_follow(char **filename, FILE **_f, Set *names, char **_final) {