From c4f4760eb48277bf4e2ae34af25725f037572f33 Mon Sep 17 00:00:00 2001
From: Samveen Gulati <samveen@yahoo.com>
Date: Fri, 27 Oct 2017 05:51:57 +0000
Subject: [PATCH] xHRM: migrate existing IP conf of $PORTS to bridge

---
 xCAT-server/share/xcat/scripts/xHRM | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/xCAT-server/share/xcat/scripts/xHRM b/xCAT-server/share/xcat/scripts/xHRM
index 200032c60..513a4dd92 100755
--- a/xCAT-server/share/xcat/scripts/xHRM
+++ b/xCAT-server/share/xcat/scripts/xHRM
@@ -1,4 +1,4 @@
-#!/bin/bash -u
+#!/bin/bash
 if [ "$(uname -s|tr '[:upper:]' '[:lower:]')" = "linux" ];then
    str_dir_name=$(dirname $0)
    . $str_dir_name/xcatlib.sh
@@ -235,7 +235,7 @@ elif [ "bridgeprereq" = "$1" ]; then
     brctl setfd $BNAME 0 #fast forwarding
     ip link set $BNAME up
     saveroutes="$(ip route | grep default| grep "dev $PORTS"|grep via|sed -e 's/dev .*//')"
-    saveip="$(ip -4 -o addr show dev enp0s3 scope global | sed 's/.*inet //'| sed 's/\( global \).*/\1/')"
+    saveip="$(ip -4 -o addr show dev $PORTS scope global | sed 's/.*inet //'| sed 's/\( global \).*/\1/')"
     if [ ! -z "$saveip" ]; then
         ip addr add dev $BNAME $newline
     else
@@ -332,6 +332,8 @@ EOF
         echo "  bridge_fd 0"
         echo "  bridge_maxwait 0"; } > "$nwdir/$BNAME"
     else
+        # Migrate some PORTS configuration to Bridge:
+        ATTRS="$(egrep '^BOOTPROTO|^IPADDR|^NETMASK|^NETWORK|^GATEWAY' $nwdir/ifcfg-$PORTS)"
         { cat <<EOF
 DEVICE=$PORTS
 ONBOOT=yes
@@ -357,11 +359,9 @@ EOF
                 echo "NETMASK=$4"
             fi
         else
-            echo "BOOTPROTO=dhcp"
+            echo "$ATTRS"
         fi ; }  > "$nwdir/ifcfg-$BNAME"
     fi 
  
     ifdown "$BNAME"; ifup "$BNAME"
 fi #END bridge config.
-
-