From e96a68d00a5dbb1e362004b5341ccd04662b2067 Mon Sep 17 00:00:00 2001 From: XuWei Date: Thu, 31 Aug 2017 22:58:21 -0400 Subject: [PATCH] Fix issue 3825, if BOOTPROTO is none consider it as static IP in xcatprobe --- xCAT-probe/lib/perl/probe_utils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-probe/lib/perl/probe_utils.pm b/xCAT-probe/lib/perl/probe_utils.pm index 47034b700..4b3835a71 100644 --- a/xCAT-probe/lib/perl/probe_utils.pm +++ b/xCAT-probe/lib/perl/probe_utils.pm @@ -182,7 +182,7 @@ sub is_static_ip { if ($os =~ /redhat/) { my $output1 = `cat /etc/sysconfig/network-scripts/ifcfg-$nic 2>&1 |grep -i IPADDR`; my $output2 = `cat /etc/sysconfig/network-scripts/ifcfg-$nic 2>&1 |grep -i BOOTPROTO`; - $rst = 1 if (($output1 =~ /$ip/) && ($output2 =~ /static/i)); + $rst = 1 if (($output1 =~ /$ip/) && ($output2 =~ /static|none/i)); } elsif ($os =~ /sles/) { my $output1 = `cat /etc/sysconfig/network/ifcfg-$nic 2>&1 |grep -i IPADDR`; my $output2 = `cat /etc/sysconfig/network/ifcfg-$nic 2>&1 |grep -i BOOTPROTO`;