Fixed one typo error for Linux
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4010 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
parent
0ad809aff0
commit
1e7e3317f3
@ -152,7 +152,7 @@ sub do_rnetboot {
|
||||
#######################################
|
||||
# Force LPAR shutdown
|
||||
#######################################
|
||||
if ( exists( $opt->{f} ) && !xCAT::Utils->isAIX() ) {
|
||||
if ( exists( $opt->{f} ) || !xCAT::Utils->isAIX() ) {
|
||||
$cmd.= " -i";
|
||||
}
|
||||
|
||||
@ -192,7 +192,7 @@ sub do_rnetboot {
|
||||
my $pid = open( OUTPUT, "$cmd 2>&1 |");
|
||||
$SIG{INT} = $SIG{TERM} = sub { #prepare to process job termination and propogate it down
|
||||
kill 9, $pid;
|
||||
exit 0;
|
||||
return( [RC_ERROR,"Received INT or TERM signal"] );
|
||||
};
|
||||
if ( !$pid ) {
|
||||
return( [RC_ERROR,"$cmd fork error: $!"] );
|
||||
@ -219,9 +219,6 @@ sub do_rnetboot {
|
||||
if ( $Rc == SUCCESS ) {
|
||||
$done = 2;
|
||||
} else {
|
||||
if ( !exists( $opt->{f} )) {
|
||||
$cmd.= " -i";
|
||||
}
|
||||
$done = $done + 1;
|
||||
sleep 1;
|
||||
}
|
||||
|
@ -297,7 +297,7 @@ sub do_getmacs {
|
||||
my $pid = open( OUTPUT, "$cmd 2>&1 |");
|
||||
$SIG{INT} = $SIG{TERM} = sub { #prepare to process job termination and propogate it down
|
||||
kill 9, $pid;
|
||||
exit 0;
|
||||
return( [RC_ERROR,"Received INT or TERM signal"] );
|
||||
};
|
||||
if ( !$pid ) {
|
||||
return( [RC_ERROR,"$cmd fork error: $!"] );
|
||||
|
Loading…
Reference in New Issue
Block a user