mirror of
				https://github.com/xcat2/xcat-core.git
				synced 2025-10-31 03:12:30 +00:00 
			
		
		
		
	Fix bug 3348885: rspconfig --resetnet failed to reset ip for fsp
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10001 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
		| @@ -109,14 +109,6 @@ sub connect { | ||||
|     # Get userid/password  | ||||
|     ################################## | ||||
|     my $cred = $req->{$server}{cred}; | ||||
|     my $name = undef; | ||||
|     if (($req->{dev} eq '1') or  | ||||
|         ($req->{command} eq 'rpower')) { | ||||
|         $name = "celogin";  | ||||
|     } else { | ||||
|         $name = $logonname{$req->{hwtype}}->[0]; | ||||
|     } | ||||
|     my @cred = xCAT::PPCdb::credentials($server, $req->{hwtype}, $name); | ||||
|     ################################## | ||||
|     # Redirect STDERR to variable  | ||||
|     ################################## | ||||
| @@ -165,8 +157,8 @@ sub connect { | ||||
|     # Submit logon | ||||
|     ################################## | ||||
|     my $res = $ua->post( $url, | ||||
|        [ user     => @cred[0], | ||||
|          password => @cred[1], | ||||
|        [ user     => @$cred[0], | ||||
|          password => @$cred[1], | ||||
|          lang     => "0", | ||||
|          submit   => "Log in" ] | ||||
|     ); | ||||
| @@ -195,7 +187,7 @@ sub connect { | ||||
|         ############################## | ||||
|         return( $ua, | ||||
|                 $server, | ||||
|                 @cred[0], | ||||
|                 @$cred[0], | ||||
|                 \$lwp_log ); | ||||
|     } | ||||
|     ############################## | ||||
| @@ -1998,7 +1990,7 @@ sub set_netcfg | ||||
|     } | ||||
|  | ||||
|     #Go to the confirm page | ||||
|     if ( $res->content !~ /\Q<input type=\'submit\'\E/) #If there is no submit button,get the error message and return | ||||
|     if ( $res->content !~ /<input type=\'submit\'/) #If there is no submit button,get the error message and return | ||||
|     { | ||||
|         my @page_lines = split /\n/, $res->content; | ||||
|         my @lines_to_print; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user