From e545907efa20f665879b0a700f0f5867dbb30b1f Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 17 Jan 2007 18:40:52 +0000
Subject: fix logic thinko that can trip up when lookup fails (#220318) also,
 clean up ifconfig usage

---
 sysconfig/network-scripts/ifup-post | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'sysconfig/network-scripts/ifup-post')

diff --git a/sysconfig/network-scripts/ifup-post b/sysconfig/network-scripts/ifup-post
index 6fc0753f..28880806 100755
--- a/sysconfig/network-scripts/ifup-post
+++ b/sysconfig/network-scripts/ifup-post
@@ -85,10 +85,9 @@ if [ "$2" = "boot" -a \
      "${DEVICETYPE}" != "ppp" -a \
      "${DEVICETYPE}" != "slip" ]; then
     if need_hostname; then
-	IPADDR=`LANG= LC_ALL= ifconfig ${DEVICE} | grep 'inet addr' | 
-		awk -F: '{ print $2 } ' | awk '{ print $1 }'`
-	eval `/bin/ipcalc --silent --hostname ${IPADDR}`
-	if [ "$?" = "0" ]; then
+	IPADDR=$(LANG=C ip -o -4 addr ls dev ${DEVICE} | awk '{ print $4 }')
+	eval $(/bin/ipcalc --silent --hostname ${IPADDR} ; echo "status=$?")
+	if [ "$status" = "0" ]; then
 	    set_hostname $HOSTNAME
 	fi
     fi
-- 
cgit v1.2.1