From feda4dddbbca448d078cc4430912355d346f2221 Mon Sep 17 00:00:00 2001 From: jjhua Date: Mon, 14 Oct 2013 12:33:55 -0400 Subject: [PATCH] fixed bug 3683. In rhels 6.x, the mksquashfs doesn't have the -le and -be options. for sles, the mksquashfs is in /usr/bin/ . --- xCAT-server/lib/xcat/plugins/packimage.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xCAT-server/lib/xcat/plugins/packimage.pm b/xCAT-server/lib/xcat/plugins/packimage.pm index 7c8b740f6..280c584eb 100644 --- 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; }