From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Tue, 14 Apr 2020 06:41:24 +0000 (+0200)
Subject: remove more --forks=1 ocurrences
X-Git-Tag: v5.1.3~25^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33f6fbbec5f4883676118c4fac286d3090a4e429;p=thirdparty%2Fknot-resolver.git

remove more --forks=1 ocurrences

It's deprecated since 5.0.0.
---

diff --git a/daemon/main.c b/daemon/main.c
index 8666e2283..01eaba927 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -247,7 +247,7 @@ static int run_worker(uv_loop_t *loop, struct engine *engine, fd_array_t *ipc_se
 	default:
 		kr_log_error(
 			"[system] error: standard input is not a terminal or pipe; "
-			"use '-f 1' if you want non-interactive mode.  "
+			"use '-n' if you want non-interactive mode.  "
 			"Commands can be simply added to your configuration file or sent over the control socket.\n"
 			);
 		return EXIT_FAILURE;
diff --git a/lib/cache/test.integr/deckard.yaml b/lib/cache/test.integr/deckard.yaml
index c531a8759..df88f83be 100644
--- a/lib/cache/test.integr/deckard.yaml
+++ b/lib/cache/test.integr/deckard.yaml
@@ -3,8 +3,7 @@ programs:
 - name: kresd
   binary: kresd
   additional:
-    - -f
-    - "1"
+    - --noninteractive
   templates:
     - lib/cache/test.integr/kresd_config.j2
     - tests/integration/hints_zone.j2
diff --git a/lib/layer/test.integr/deckard.yaml b/lib/layer/test.integr/deckard.yaml
index 493067ace..d2d62d0d2 100644
--- a/lib/layer/test.integr/deckard.yaml
+++ b/lib/layer/test.integr/deckard.yaml
@@ -3,8 +3,7 @@ programs:
 - name: kresd
   binary: kresd
   additional:
-    - -f
-    - "1"
+    - --noninteractive
   templates:
     - lib/layer/test.integr/kresd_config.j2
     - tests/integration/hints_zone.j2
diff --git a/modules/bogus_log/test.integr/deckard.yaml b/modules/bogus_log/test.integr/deckard.yaml
index b7e9219b9..ecd6cc500 100644
--- a/modules/bogus_log/test.integr/deckard.yaml
+++ b/modules/bogus_log/test.integr/deckard.yaml
@@ -3,8 +3,7 @@ programs:
 - name: kresd
   binary: kresd
   additional:
-    - -f
-    - "1"
+    - --noninteractive
   templates:
     - modules/bogus_log/test.integr/kresd_config.j2
     - tests/integration/hints_zone.j2
diff --git a/modules/daf/test.integr/deckard.yaml b/modules/daf/test.integr/deckard.yaml
index d987acfa2..455086fff 100644
--- a/modules/daf/test.integr/deckard.yaml
+++ b/modules/daf/test.integr/deckard.yaml
@@ -3,8 +3,7 @@ programs:
 - name: kresd
   binary: kresd
   additional:
-    - -f
-    - "1"
+    - --noninteractive
   templates:
     - modules/daf/test.integr/kresd_config.j2
     - tests/integration/hints_zone.j2
diff --git a/modules/policy/noipv6.test.integr/deckard.yaml b/modules/policy/noipv6.test.integr/deckard.yaml
index 3cd0ab071..4c1b6f84c 100644
--- a/modules/policy/noipv6.test.integr/deckard.yaml
+++ b/modules/policy/noipv6.test.integr/deckard.yaml
@@ -3,8 +3,7 @@ programs:
 - name: kresd
   binary: kresd
   additional:
-    - -f
-    - "1"
+    - --noninteractive
   templates:
     - modules/policy/noipv6.test.integr/kresd_config.j2
     - tests/integration/hints_zone.j2
diff --git a/modules/policy/noipvx.test.integr/deckard.yaml b/modules/policy/noipvx.test.integr/deckard.yaml
index 710fb71e6..817875986 100644
--- a/modules/policy/noipvx.test.integr/deckard.yaml
+++ b/modules/policy/noipvx.test.integr/deckard.yaml
@@ -3,8 +3,7 @@ programs:
 - name: kresd
   binary: kresd
   additional:
-    - -f
-    - "1"
+    - --noninteractive
   templates:
     - modules/policy/noipvx.test.integr/kresd_config.j2
     - tests/integration/hints_zone.j2
diff --git a/tests/pytests/kresd.py b/tests/pytests/kresd.py
index 632b7a1f8..75776f2ea 100644
--- a/tests/pytests/kresd.py
+++ b/tests/pytests/kresd.py
@@ -94,7 +94,7 @@ class Kresd(ContextDecorator):
         create_file_from_template(KRESD_CONF_TEMPLATE, self.config_path, {'kresd': self})
         self.logfile = open(self.logfile_path, 'w')
         self.process = subprocess.Popen(
-            ['kresd', '-c', self.config_path, '-f', '1', self.workdir],
+            ['kresd', '-c', self.config_path, '-n', self.workdir],
             stdout=self.logfile, env=os.environ.copy())
 
         try: