xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update EDEX manager to account for non-routable IP addresses, and change spec file dependency from deprecated PreReq to Requires

Browse source 
Former-commit-id: 752a938c57
This commit is contained in:
mjames-upc 2015-02-24 15:36:20 -07:00
parent 4b3291a4f6
commit 41512ba7b2
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rpms/awips2.upc/Installer.edex-upc/component.spec
View file

@ -15,7 +15,7 @@ Vendor: Unidata
Packager: Michael James
AutoReq: no
PreReq: awips2-tools
Requires: awips2-tools
provides: awips2-edex-upc
%description

20
rpms/awips2.upc/Installer.edex-upc/edex
View file

@ -48,10 +48,28 @@ nopts=${options[@]}
# Construct IP subnet
#
# OS X
#IP=`ifconfig | grep -E 'inet.[0-9]' | grep -v '127.0.0.1' | awk '{ print $2}'`
# Linux
# Simple solution
#IP=`hostname -I`
# For multiple IP addresses we need to account for non-routable IPs
#IP=`/sbin/ifconfig | grep "inet addr" | grep -v 127.0.0 | awk '{ print $2 }' | cut -d: -f2`
IP=`hostname -I`
IP=`/sbin/ifconfig eth0 | grep "inet addr" | awk '{ print $2 }' | cut -d: -f2`
if [[ $IP =~ ^10\..* || $IP =~ ^192\.168.* ]] # non-routable IP range
then
IP=`/sbin/ifconfig eth1 | grep "inet addr" | awk '{ print $2 }' | cut -d: -f2`
elif [[ $IP =~ ^172\..* ]]
then
IPb=`echo $IP | cut -d"." -f2`
if [[ $IPb -gt 15 && $IPb -lt 32 ]] # non-routable 172.16 to 172.32 range
then
IP=`/sbin/ifconfig eth1 | grep "inet addr" | awk '{ print $2 }' | cut -d: -f2`
fi
fi
# truncate
IP_CIDR="${IP%.*}"