mirror of
				https://github.com/xcat2/xcat-core.git
				synced 2025-10-31 03:12:30 +00:00 
			
		
		
		
	updated dhcp.pm to put out a warning message when subnet/netmask for network in network table does not match network configured
This commit is contained in:
		| @@ -2166,21 +2166,21 @@ sub addnet | ||||
|             while ($idx <= $#dhcpconf) | ||||
|             { | ||||
|                 if ($dhcpconf[$idx] =~ /\} # $nic nic_end\n/) | ||||
|             { | ||||
|                 last; | ||||
|             } | ||||
|             $idx++; | ||||
|                 { | ||||
|                     last; | ||||
|                 } | ||||
|                 $idx++; | ||||
|             } | ||||
|             unless ($dhcpconf[$idx] =~ /\} # $nic nic_end\n/) | ||||
|             { | ||||
|                   $callback->( | ||||
|                       { | ||||
|                          error => | ||||
|                             ["Could not add the subnet $net/$mask for nic $nic into $dhcpconffile."], | ||||
|                 $callback->( | ||||
| 	            { | ||||
|                         error => | ||||
|                             ["Could not add the subnet $net/$mask for nic $nic into $dhcpconffile.\nPlease verify the xCAT database matches networks defined on this system."], | ||||
|                             errorcode => [1] | ||||
|                       } | ||||
|                   ); | ||||
|                 return 1;    #TODO: this is an error condition | ||||
|                     } | ||||
|                 ); | ||||
|                 return 1; | ||||
|             } | ||||
|         } | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user