remove more --forks=1 ocurrences

It's deprecated since 5.0.0.

diff --git a/daemon/main.c b/daemon/main.c
index 8666e228313ea4ae0e3c33498d08d12cf7cefb29..01eaba92767025a989f663556a28cfcf10e8d061 100644 (file)
--- 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 c531a875971681811ecfad17e4050930eff909ed..df88f83bebc11d34bca8b6699d73207e996be522 100644 (file)
--- 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 493067acebf82bf94d4d96f14ddba834b0e5950f..d2d62d0d2d84336a9ddee074ef011f9eabc61142 100644 (file)
--- 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 b7e9219b9eb8f394ee5f33eaec6b79b8a7dffbd8..ecd6cc500c4ed75e58e3f325299370173e0e0ee1 100644 (file)
--- 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 d987acfa27520ac49d8aaed78fbd2459271be3a3..455086fff2fd21cb986c920b6bc6b196abbc9645 100644 (file)
--- 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 3cd0ab071d9ceca9d3894e1de9997d39846cabd7..4c1b6f84c9df9c269676d117eb47aadee0b3d64b 100644 (file)
--- 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 710fb71e61695ddf9411e24bd72ea691b9b51006..8178759862fd2e5e722b00ad6a29810e16728b35 100644 (file)
--- 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 632b7a1f829a9519d58afa34d4a65d84a25d0971..75776f2ea4895f6128660e6cbf0d372e970a441b 100644 (file)
--- 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: