From 1e7e3317f3884faad86c4de10a494017f949e41f Mon Sep 17 00:00:00 2001
From: wanghuaz <wanghuaz@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 19 Aug 2009 07:05:13 +0000
Subject: [PATCH] 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
---
 perl-xCAT/xCAT/PPCboot.pm | 7 ++-----
 perl-xCAT/xCAT/PPCmac.pm  | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/perl-xCAT/xCAT/PPCboot.pm b/perl-xCAT/xCAT/PPCboot.pm
index 6459e6b1c..a0c067452 100644
--- a/perl-xCAT/xCAT/PPCboot.pm
+++ b/perl-xCAT/xCAT/PPCboot.pm
@@ -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;
         }
diff --git a/perl-xCAT/xCAT/PPCmac.pm b/perl-xCAT/xCAT/PPCmac.pm
index d101dffbc..7ae1f2a09 100644
--- a/perl-xCAT/xCAT/PPCmac.pm
+++ b/perl-xCAT/xCAT/PPCmac.pm
@@ -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: $!"] );