fixed bug 3683. In rhels 6.x, the mksquashfs doesn't have the -le and -be options.

2013-10-14 12:30:07 -04:00
parent 82157e991e
commit 6c9234df79
1 changed files with 6 additions and 1 deletions
--- a/xCAT-server/lib/xcat/plugins/packimage.pm
+++ b/xCAT-server/lib/xcat/plugins/packimage.pm
@@ -394,7 +394,12 @@ sub process_request {
       } elsif ($arch =~ /ppc/) {
          $flags="-be";
       }
-       if (! -x "/sbin/mksquashfs") {
+
+       if( $osver =~ /rhels/ && $osver !~ /rhels5/) {
+           $flags="";
+       }
+       
+       if (! -x "/sbin/mksquashfs" && ! -x "/usr/bin/mksquashfs" ) {
          $callback->({error=>["mksquashfs not found, squashfs-tools rpm should be installed on the management node"],errorcode=>[1]});
          return;
       }