xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-24 20:20:33 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3830 from xuweibj/I3825

Browse Source 
Fix issue 3825, if BOOTPROTO is none consider it as static IP in xcatprobe
This commit is contained in:
Gᴏɴɢ Jie
2017-09-01 12:43:07 +08:00
committed by GitHub
parent 50039719b0 e96a68d00a
commit 2d53fc5bd9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-probe/lib/perl/probe_utils.pm
View File

@@ -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`;