From 35d299f9d6a270067efbe52c0fd70dc87727cd3a Mon Sep 17 00:00:00 2001
From: immarvin <yangsbj@cn.ibm.com>
Date: Wed, 11 Oct 2017 04:19:50 -0400
Subject: [PATCH] fix issue If service node is down, control to OpenBMC node
 never returns #3888:use port 3004 instead of 3001 to run debug commands
 inside installer

---
 xCAT-server/sbin/runcmdinstaller                        | 2 +-
 xCAT-server/share/xcat/install/scripts/pre.debian       | 2 +-
 xCAT-server/share/xcat/install/scripts/pre.rh           | 2 +-
 xCAT-server/share/xcat/install/scripts/pre.rh.rhels7    | 2 +-
 xCAT-server/share/xcat/install/scripts/pre.sles         | 2 +-
 xCAT-server/share/xcat/install/scripts/pre.ubuntu       | 2 +-
 xCAT-server/share/xcat/install/scripts/pre.ubuntu.ppc64 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/xCAT-server/sbin/runcmdinstaller b/xCAT-server/sbin/runcmdinstaller
index 12875267f..94ae4554f 100755
--- a/xCAT-server/sbin/runcmdinstaller
+++ b/xCAT-server/sbin/runcmdinstaller
@@ -58,5 +58,5 @@ if [ "$retcode" != "0" ];then
     exit $retcode
 fi
 
-echo "sh $cmd 2>&1" | nc -w 20 $node 3001 
+echo "sh $cmd 2>&1" | nc -w 20 $node 3004 
 
diff --git a/xCAT-server/share/xcat/install/scripts/pre.debian b/xCAT-server/share/xcat/install/scripts/pre.debian
index cabbe9c68..5dd492da7 100644
--- a/xCAT-server/share/xcat/install/scripts/pre.debian
+++ b/xCAT-server/share/xcat/install/scripts/pre.debian
@@ -36,7 +36,7 @@ cat >/tmp/foo.awk <<EOF
 #!$AWK -f
 
 BEGIN {
-	ns = "/inet/tcp/3001/0/0"
+	ns = "/inet/tcp/3004/0/0"
 
 	while(1) {
 		ns |& getline
diff --git a/xCAT-server/share/xcat/install/scripts/pre.rh b/xCAT-server/share/xcat/install/scripts/pre.rh
index 7cc7e1199..a8e8658b0 100644
--- a/xCAT-server/share/xcat/install/scripts/pre.rh
+++ b/xCAT-server/share/xcat/install/scripts/pre.rh
@@ -71,7 +71,7 @@ sock.close()
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 
-port = 3001
+port = 3004
 sock.bind(('', port))
 
 sock.listen(5)
diff --git a/xCAT-server/share/xcat/install/scripts/pre.rh.rhels7 b/xCAT-server/share/xcat/install/scripts/pre.rh.rhels7
index 074ab0e62..b5e0d3f71 100755
--- a/xCAT-server/share/xcat/install/scripts/pre.rh.rhels7
+++ b/xCAT-server/share/xcat/install/scripts/pre.rh.rhels7
@@ -60,7 +60,7 @@ sock.close()
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 
-port = 3001
+port = 3004
 sock.bind(('', port))
 
 sock.listen(5)
diff --git a/xCAT-server/share/xcat/install/scripts/pre.sles b/xCAT-server/share/xcat/install/scripts/pre.sles
index 21b2c6de7..41d2c070f 100644
--- a/xCAT-server/share/xcat/install/scripts/pre.sles
+++ b/xCAT-server/share/xcat/install/scripts/pre.sles
@@ -39,7 +39,7 @@ cat >/tmp/foo.awk <<EOF
 #!$AWK -f
 
 BEGIN {
-	ns = "/inet/tcp/3001/0/0"
+	ns = "/inet/tcp/3004/0/0"
 
 	while(1) {
 		ns |& getline
diff --git a/xCAT-server/share/xcat/install/scripts/pre.ubuntu b/xCAT-server/share/xcat/install/scripts/pre.ubuntu
index 3ca5e4515..504c62747 100644
--- a/xCAT-server/share/xcat/install/scripts/pre.ubuntu
+++ b/xCAT-server/share/xcat/install/scripts/pre.ubuntu
@@ -46,7 +46,7 @@ if [ \$# -eq 0 ]; then
     fi
 
     while true; do
-        /usr/bin/nc -l -p 3001 -e /tmp/foo.sh serve_client
+        /usr/bin/nc -l -p 3004 -e /tmp/foo.sh serve_client
     done
 
     exit 1                        # never reached; reboot ends this
diff --git a/xCAT-server/share/xcat/install/scripts/pre.ubuntu.ppc64 b/xCAT-server/share/xcat/install/scripts/pre.ubuntu.ppc64
index 7fe22bf84..171f3d988 100644
--- a/xCAT-server/share/xcat/install/scripts/pre.ubuntu.ppc64
+++ b/xCAT-server/share/xcat/install/scripts/pre.ubuntu.ppc64
@@ -46,7 +46,7 @@ if [ \$# -eq 0 ]; then
     fi
 
     while true; do
-        /usr/bin/nc -l -p 3001 -e /tmp/foo.sh serve_client
+        /usr/bin/nc -l -p 3004 -e /tmp/foo.sh serve_client
     done
 
     exit 1                        # never reached; reboot ends this