From ae9641a7c02a3fd64f08469c0072670b098c1914 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@mandriva.com>
Date: Mon, 18 Jan 2010 15:17:15 +0000
Subject: no need for squashfs_lzma and squashfs3 now that support has been
 merged in the kernel

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

(limited to 'lib')

diff --git a/lib/MDV/Draklive/Loopback.pm b/lib/MDV/Draklive/Loopback.pm
index 4429574..514de78 100644
--- a/lib/MDV/Draklive/Loopback.pm
+++ b/lib/MDV/Draklive/Loopback.pm
@@ -15,7 +15,7 @@ our %loop_types;
     squashfs => {
         read_only => 1,
         is_loopback => 1,
-        modules => [ qw(loop sqlzma squashfs_lzma) ],
+        modules => [ qw(loop squashfs) ],
         extension => '-lzma.sqfs',
         build => sub {
             my ($live, $dir) = @_;
@@ -30,12 +30,12 @@ our %loop_types;
             output_p($exclude_file, map { $root . "$_\n" }  grep { -e $root . $_ } @{$dir->{exclude} || []});
             my $sort = $live->{settings}{config_root} . '/' . $dir->{sort};
             run_foreach(sub {
-                            if (/^mksquashfs3: file .*, uncompressed size (\d+) bytes\s*(?:DUPLICATE|LINK)?$/) {
+                            if (/^mksquashfs: file .*, uncompressed size (\d+) bytes\s*(?:DUPLICATE|LINK)?$/) {
                                 $progress->{current} += $1;
                                 $progress->show(time());
                             }
                         },
-                        'mksquashfs3', $src, $dest, '-noappend', '-no-progress', '-info', '-lzma', '-b', '1048576',
+                        'mksquashfs', $src, $dest, '-noappend', '-comp', 'lzma',
                         #'-processors', 1,
                         '-ef', $exclude_file,
                         if_(-f $sort, '-sort', $sort),
-- 
cgit v1.2.1