From 9a5caceeb53ada0b1c5df00df4a7428e118a520b Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Thu, 1 Apr 2010 13:18:39 +0000
Subject: use mksquashfs3 if available

---
 lib/MDV/Draklive/Loopback.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/MDV/Draklive/Loopback.pm b/lib/MDV/Draklive/Loopback.pm
index 4ddd803..dcff4d6 100644
--- a/lib/MDV/Draklive/Loopback.pm
+++ b/lib/MDV/Draklive/Loopback.pm
@@ -29,13 +29,15 @@ our %loop_types;
             my $exclude_file = tmpnam();
             output_p($exclude_file, map { $root . "$_\n" }  grep { -e $root . $_ } @{$dir->{exclude} || []});
             my $sort = $live->{settings}{config_root} . '/' . $dir->{sort};
+            my $mksquashfs = whereis_binary("mksquashfs3") || whereis_binary("mksquashfs");
+            $mksquashfs or die "unable to find mksquashfs binary";
             run_foreach(sub {
                             if (/^mksquashfs: file .*, uncompressed size (\d+) bytes\s*(?:DUPLICATE|LINK)?$/) {
                                 $progress->{current} += $1;
                                 $progress->show(time());
                             }
                         },
-                        'mksquashfs', $src, $dest, '-noappend', '-no-progress', '-info', '-lzma', '-b', '1048576',
+                        $mksquashfs, $src, $dest, '-noappend', '-no-progress', '-info', '-lzma', '-b', '1048576',
                         #'-processors', 1,
                         '-ef', $exclude_file,
                         if_(-f $sort, '-sort', $sort),
-- 
cgit v1.2.1