From: davidplunkett <dp7642@att.com>
Date: Thu, 7 Feb 2019 03:23:24 +0000 (+0000)
Subject: improved local subnet and mask logic
X-Git-Tag: 1.0.0~33
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F80%2F380%2F1;p=redfish.git

improved local subnet and mask logic

Change-Id: I307d83ac623ebc1c0fe13690e269d81acf313ba4
Signed-off-by: davidplunkett <dp7642@att.com>
---

diff --git a/install_server_os.sh b/install_server_os.sh
index 7f723b6..ef5c98c 100755
--- a/install_server_os.sh
+++ b/install_server_os.sh
@@ -253,12 +253,12 @@ subnet $SRV_SUBNET netmask $SRV_NETMASK {
 }
 EOF
 
-LOCAL_INF=$(ip route get $SRV_IP | grep "$SRV_IP" | cut -f 5 -d ' ')
-LOCAL_SUBNET=$(route -n | grep " U " | grep "$LOCAL_INF" | awk '{print $1}')
-LOCAL_NETMASK=$(route -n | grep " U " | grep "$LOCAL_INF" | awk '{print $3}')
+LOCAL_INF=$(ip route get $SRV_IP | grep "$SRV_IP" | awk '{print $3}')
+LOCAL_SUBNET=$(route -n | grep " U " | grep "$LOCAL_INF" | head -n 1 | awk '{print $1}')
+LOCAL_NETMASK=$(route -n | grep " U " | grep "$LOCAL_INF" | head -n 1 | awk '{print $3}')
 echo "Local interface to access $SRV_IP is [$LOCAL_INF] with subnet/mask [$LOCAL_SUBNET/$LOCAL_NETMASK]"
 
-if [ "$SRV_SUBNET" != "$LOCAL_NET" ]; then
+if [ "$SRV_SUBNET" != "$LOCAL_SUBNET" ] && [[ $LOCAL_SUBNET =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]] ; then
     echo "Updating dhcp configuration [$DHCP_ROOT/dhcpd.conf] with local subnet [$LOCAL_SUBNET]"
     perl -i -p0e "s/^subnet $LOCAL_SUBNET .*?\n\}\n//gms" $DHCP_ROOT/dhcpd.conf
     cat >>$DHCP_ROOT/dhcpd.conf <<EOF