Merge branch 'ondrej/revert---restart-to---restart_server-rename' into 'master'

Revert the --restart -> --restart_server rename

See merge request isc-projects/bind9!3481

bin/tests/system/dnssec/tests.sh

@@ -2057,7 +2057,7 @@ echo_i "waiting till 14s have passed since NTAs were added before restarting ns4
 $PERL -e 'my $delay = '"$start"' + 14 - time(); select(undef, undef, undef, $delay) if ($delay > 0);'
 
 if
-    start_server --noclean --restart_server --port "$PORT" dnssec ns4
+    start_server --noclean --restart --port "$PORT" dnssec ns4
 then
     echo_i "restarted server ns4"
 else
@@ -2123,7 +2123,7 @@ echo "secure.example. regular $future" > ns4/_default.nta
 start=$($PERL -e 'print time()."\n";')
 
 if
-    start_server --noclean --restart_server --port "$PORT" dnssec ns4
+    start_server --noclean --restart --port "$PORT" dnssec ns4
 then
     echo_i "restarted server ns4"
 else
@@ -2179,7 +2179,7 @@ echo "secure.example. forced $future" > ns4/_default.nta
 start=$($PERL -e 'print time()."\n";')
 
 if
-    start_server --noclean --restart_server --port "$PORT" dnssec ns4
+    start_server --noclean --restart --port "$PORT" dnssec ns4
 then
     echo_i "restarted server ns4"
 else
@@ -2227,7 +2227,7 @@ echo "secure.example. forced $future" > ns4/_default.nta
 added=$($PERL -e 'print time()."\n";')
 
 if
-    start_server --noclean --restart_server --port "$PORT" dnssec ns4
+    start_server --noclean --restart --port "$PORT" dnssec ns4
 then
     echo_i "restarted server ns4"
 else
@@ -3789,7 +3789,7 @@ grep "trust-anchor-telemetry './IN' from .* 65534" ns1/named.run > /dev/null ||
 grep "trust-anchor-telemetry './IN' from .* 65533" ns1/named.run > /dev/null && ret=1
 $PERL $SYSTEMTESTTOP/stop.pl dnssec ns1 || ret=1
 nextpart ns1/named.run > /dev/null
-start_server --noclean --restart_server --port ${PORT} dnssec ns1 || ret=1
+start_server --noclean --restart --port ${PORT} dnssec ns1 || ret=1
 n=$(($n+1))
 test "$ret" -eq 0 || echo_i "failed"
 status=$((status+ret))

bin/tests/system/masterformat/tests.sh

@@ -80,7 +80,7 @@ stomp () {
 
 restart () {
     sleep 1
-    start_server --noclean --restart_server --port "${PORT}" masterformat ns3
+    start_server --noclean --restart --port "${PORT}" masterformat ns3
 }
 
 dig_with_opts() {

bin/tests/system/nsupdate/tests.sh

@@ -337,7 +337,7 @@ rm named.pid
 cd ..
 sleep 10
 if
-	start_server --noclean --restart_server --port ${PORT} nsupdate ns1
+	start_server --noclean --restart --port ${PORT} nsupdate ns1
 then
 	echo_i "restarted server ns1"
 else
@@ -519,7 +519,7 @@ sleep 3
 # that the data served by the new server process are exactly
 # those dumped to the master file by "rndc stop".
 rm -f ns1/*jnl
-start_server --noclean --restart_server --port ${PORT} nsupdate ns1
+start_server --noclean --restart --port ${PORT} nsupdate ns1
 for try in 0 1 2 3 4 5 6 7 8 9; do
     iret=0
     $DIG $DIGOPTS +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd \

bin/tests/system/rpz/tests.sh

@@ -215,7 +215,7 @@ restart () {
             done
         fi
     fi
-    start_server --noclean --restart_server --port ${PORT} rpz ns$1
+    start_server --noclean --restart --port ${PORT} rpz ns$1
     load_db
     dnsrps_loaded
     sleep 1
@@ -482,7 +482,7 @@ for mode in native dnsrps; do
       continue
     else
       echo_i "running DNSRPS sub-test"
-      start_server --noclean --restart_server --port ${PORT} rpz
+      start_server --noclean --restart --port ${PORT} rpz
       sleep 3
     fi
     ;;

bin/tests/system/rpzrecurse/tests.sh

@@ -51,7 +51,7 @@ run_server() {
 
     echo_i "starting resolver using named.$TESTNAME.conf"
     cp -f ns2/named.$TESTNAME.conf ns2/named.conf
-    start_server --noclean --restart_server --port ${PORT} rpzrecurse ns2
+    start_server --noclean --restart --port ${PORT} rpzrecurse ns2
     sleep 3
 }
 
@@ -133,7 +133,7 @@ for mode in native dnsrps; do
       continue
     else
       echo_i "running DNSRPS sub-test"
-      start_server --noclean --restart_server --port ${PORT} rpzrecurse
+      start_server --noclean --restart --port ${PORT} rpzrecurse
       sleep 3
     fi
     ;;

bin/tests/system/stub/tests.sh

@@ -55,7 +55,7 @@ digcomp knowngood.dig.out.rec dig.out.ns3 || ret=1
 	$PERL $SYSTEMTESTTOP/stop.pl stub ns3
 
 	echo_i "re-starting stub server"
-	start_server --noclean --restart_server --port ${PORT} stub ns3
+	start_server --noclean --restart --port ${PORT} stub ns3
 }
 done