[rt46602] Fix EXTRAPORT substitutions in copy_setport

Fix problems where all EXTRAPORT macros were being replaced by
the EXTRAPORT1 value. (Copy and paste issue.)

(cherry picked from commit fb78f82ba1da007151518b013be1e2bd49fac03e)
(cherry picked from commit 8513c4256b0e36029318827784d856a163297174)
(cherry picked from commit c8880ce14a438d3d5305fa0f76230ff3c8c3a853)

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index f0a0dae14e12ea10b50bf9f0d856f3f2c2655c54..8b4762efb82f393573b91a6313f16ddd36ac6c60 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -230,13 +230,13 @@ nextpart () {
 copy_setports() {
     sed -e "s/@PORT@/${PORT}/g" \
         -e "s/@EXTRAPORT1@/${EXTRAPORT1}/g" \
-        -e "s/@EXTRAPORT2@/${EXTRAPORT1}/g" \
-        -e "s/@EXTRAPORT3@/${EXTRAPORT1}/g" \
-        -e "s/@EXTRAPORT4@/${EXTRAPORT1}/g" \
-        -e "s/@EXTRAPORT5@/${EXTRAPORT1}/g" \
-        -e "s/@EXTRAPORT6@/${EXTRAPORT1}/g" \
-        -e "s/@EXTRAPORT7@/${EXTRAPORT1}/g" \
-        -e "s/@EXTRAPORT8@/${EXTRAPORT1}/g" \
+        -e "s/@EXTRAPORT2@/${EXTRAPORT2}/g" \
+        -e "s/@EXTRAPORT3@/${EXTRAPORT3}/g" \
+        -e "s/@EXTRAPORT4@/${EXTRAPORT4}/g" \
+        -e "s/@EXTRAPORT5@/${EXTRAPORT5}/g" \
+        -e "s/@EXTRAPORT6@/${EXTRAPORT6}/g" \
+        -e "s/@EXTRAPORT7@/${EXTRAPORT7}/g" \
+        -e "s/@EXTRAPORT8@/${EXTRAPORT8}/g" \
         -e "s/@CONTROLPORT@/${CONTROLPORT}/g" $1 > $2
 }