From 4d0508e3401cd634abc60dd4e66b2e00fef69fb9 Mon Sep 17 00:00:00 2001 From: Elena Gryaznova Date: Mon, 30 Aug 2010 21:12:50 +0400 Subject: [PATCH] b=23234 use a regular expression to parse ip_addr from ret_str in lc_net a=Chris Horn (CRAY) i=Elena Gryaznova i=Andrew Perepechko --- lustre/scripts/lc_net.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lustre/scripts/lc_net.in b/lustre/scripts/lc_net.in index 16196d3..fef2637 100644 --- a/lustre/scripts/lc_net.in +++ b/lustre/scripts/lc_net.in @@ -169,11 +169,8 @@ remote_check() { fi # Get the IP address of ${HOST_NAMES[i]} from its own ping - if is_pdsh; then - ip_addr=`echo "${ret_str}" | head -1 | awk '{print $4}'` - else - ip_addr=`echo "${ret_str}" | head -1 | awk '{print $3}'` - fi + ip_pattern="[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}" + ip_addr=`echo "${ret_str}" | egrep -o "${ip_pattern}"` ip_addr=`echo "${ip_addr}" | sed -e 's/^(//' -e 's/)$//'` # Compare IP addresses -- 1.8.3.1