summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2010-04-01 13:18:39 +0000
committerOlivier Blin <oblin@mandriva.com>2010-04-01 13:18:39 +0000
commit9a5caceeb53ada0b1c5df00df4a7428e118a520b (patch)
treeaae67ef16a88ac992a981191def93580e3368229
parent0ecab5ea8bf07cebe818214856b4ff521e883bce (diff)
downloaddraklive-9a5caceeb53ada0b1c5df00df4a7428e118a520b.tar
draklive-9a5caceeb53ada0b1c5df00df4a7428e118a520b.tar.gz
draklive-9a5caceeb53ada0b1c5df00df4a7428e118a520b.tar.bz2
draklive-9a5caceeb53ada0b1c5df00df4a7428e118a520b.tar.xz
draklive-9a5caceeb53ada0b1c5df00df4a7428e118a520b.zip
use mksquashfs3 if availabledistro/mdv2009.0
-rw-r--r--lib/MDV/Draklive/Loopback.pm4
1 files changed, 3 insertions, 1 deletions
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),