treewide: use --noninteractive instead of --forks

diff --git a/ci/respdiff/restart-kresd.sh b/ci/respdiff/restart-kresd.sh
index 99aff43c4235f257312836d9026d4cba1148adf8..a1244837c3c0af4b2ff787e3265af783d9c65da6 100755 (executable)
--- a/ci/respdiff/restart-kresd.sh
+++ b/ci/respdiff/restart-kresd.sh
@@ -4,7 +4,7 @@ exec 2>&1
 
 killall -w kresd
 rm -f '*.mdb'
-$PREFIX/sbin/kresd -f 1 -q -c $(pwd)/ci/respdiff/kresd.config &>>kresd.log &
+$PREFIX/sbin/kresd -n -q -c $(pwd)/ci/respdiff/kresd.config &>>kresd.log &
 
 # wait until socket is receiving connections
 sleep 1

diff --git a/ci/respdiff/start-resolvers.sh b/ci/respdiff/start-resolvers.sh
index bab2b2ae3cde2da83e5231c7f64f7fb8c77eccfd..a5655f76fdee87c71e393c87a2b4dc6104519325 100755 (executable)
--- a/ci/respdiff/start-resolvers.sh
+++ b/ci/respdiff/start-resolvers.sh
@@ -7,5 +7,5 @@ service bind9 start && service bind9 status;
 # dig @localhost -p 53533
 
 #run kresd
-$PREFIX/sbin/kresd -f 1 -q -c $(pwd)/ci/respdiff/kresd.config &>kresd.log &
+$PREFIX/sbin/kresd -n -q -c $(pwd)/ci/respdiff/kresd.config &>kresd.log &
 # dig @localhost -p 5353

diff --git a/doc/kresd.8.in b/doc/kresd.8.in
index 68cedc12a20a14b206c504a02ed0d3ce9cf2b40e..2f0f190a4eeb854e5945a3cc950eb2ac6ea2e4a6 100644 (file)
--- a/doc/kresd.8.in
+++ b/doc/kresd.8.in
@@ -124,7 +124,7 @@ A number greater than 1 forks the daemon N times, all forks will bind to same ad
 and the kernel will load-balance between them on Linux with \fISO_REUSEPORT\fR support.
 
 When socket-activated and supervised by systemd or the equivalent, kresd defaults to
---forks=1, and must not be set to any other value.  If you want multiple concurrent
+--noninteractive.  If you want multiple concurrent
 processes supervised in this way, they should be supervised independently (see
 \fBkresd.systemd(7)\fR).
 .TP

diff --git a/scripts/dockerfile_gen.py b/scripts/dockerfile_gen.py
index 4ce17180ff91f497b0e03ba1f3a54605c6fb4b9b..9f3991068a2bb6733f587ad2d575da16c9dc8bd6 100755 (executable)
--- a/scripts/dockerfile_gen.py
+++ b/scripts/dockerfile_gen.py
@@ -175,7 +175,7 @@ class Component():
         if os.path.exists(configcmdpath):
             self._comp_script('test.sh')
         elif os.path.exists(configtestpath):
-            self.image.cmd('kresd -f 1 -c {}'.format(configtestpath))
+            self.image.cmd('kresd -n -c {}'.format(configtestpath))
         self.image.run_script(self.compimg_path + '/post-run.sh')
 
 

diff --git a/systemd/nosocket/kresd@.service.in b/systemd/nosocket/kresd@.service.in
index 3e846b7c97a164fd793f97d9918fbe46bceaf6ca..ade5f0064f5a085a4db93394ca0616af1afbc651 100644 (file)
--- a/systemd/nosocket/kresd@.service.in
+++ b/systemd/nosocket/kresd@.service.in
@@ -11,7 +11,7 @@ After=network-online.target
 Type=notify
 Environment="SYSTEMD_INSTANCE=%i"
 WorkingDirectory=@systemd_work_dir@
-ExecStart=@sbin_dir@/kresd --config=@etc_dir@/kresd.conf --forks=1
+ExecStart=@sbin_dir@/kresd --config=@etc_dir@/kresd.conf --noninteractive
 User=@user@
 Group=@group@
 CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_SETPCAP