mirror of
				https://github.com/xcat2/xcat-core.git
				synced 2025-10-31 03:12:30 +00:00 
			
		
		
		
	fix bug 3745: makehosts -d to delete otherinterfaces hosts
This commit is contained in:
		
							
								
								
									
										30
									
								
								xCAT-server/lib/xcat/plugins/hosts.pm
									
									
									
									
									
										
										
										Normal file → Executable file
									
								
							
							
						
						
									
										30
									
								
								xCAT-server/lib/xcat/plugins/hosts.pm
									
									
									
									
									
										
										
										Normal file → Executable file
									
								
							| @@ -203,6 +203,32 @@ sub addotherinterfaces | ||||
|     } | ||||
| } | ||||
|  | ||||
| sub delotherinterfaces | ||||
| { | ||||
|     my $node            = shift; | ||||
|     my $otherinterfaces = shift; | ||||
|     my $domain          = shift; | ||||
|  | ||||
|     my @itf_pairs = split(/,/, $otherinterfaces); | ||||
|     foreach (@itf_pairs) | ||||
|     { | ||||
| 		my ($itf, $ip);  | ||||
| 		if ($_  =~ /!/) { | ||||
| 			($itf, $ip) = split(/!/, $_); | ||||
| 		} else { | ||||
|         	($itf, $ip) = split(/:/, $_); | ||||
| 		} | ||||
|         if ($ip && xCAT::NetworkUtils->isIpaddr($ip)) | ||||
|         { | ||||
|             if ($itf =~ /^-/) | ||||
|             { | ||||
|                 $itf = $node . $itf; | ||||
|             } | ||||
|             delnode $itf, $ip, '', $domain; | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| sub add_hosts_content { | ||||
| 	my %args = @_; | ||||
| 	my $nodelist = $args{nodelist}; | ||||
| @@ -245,6 +271,10 @@ sub add_hosts_content { | ||||
|                 if ($DELNODE) | ||||
|                 { | ||||
|                     delnode $nodename, $ip, $ref->{hostnames}, $domain; | ||||
|                     if (defined($ref->{otherinterfaces})) | ||||
|                     { | ||||
|                         delotherinterfaces $nodename, $ref->{otherinterfaces}, $domain; | ||||
|                     } | ||||
|                 } | ||||
|                 else | ||||
|                 { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user