diff options
| author | Christophe Fergeau <cfergeau@mandriva.com> | 2010-01-18 15:17:15 +0000 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@mandriva.com> | 2010-01-18 15:17:15 +0000 |
| commit | ae9641a7c02a3fd64f08469c0072670b098c1914 (patch) | |
| tree | 7ff12f3bb629d9ff05dfb6f8bdc4199a1935d456 /lib/MDV | |
| parent | 5a1c59267dd3b4ceb24a5a63f58aa5e254dd1628 (diff) | |
| download | drakiso-ae9641a7c02a3fd64f08469c0072670b098c1914.tar drakiso-ae9641a7c02a3fd64f08469c0072670b098c1914.tar.gz drakiso-ae9641a7c02a3fd64f08469c0072670b098c1914.tar.bz2 drakiso-ae9641a7c02a3fd64f08469c0072670b098c1914.tar.xz drakiso-ae9641a7c02a3fd64f08469c0072670b098c1914.zip | |
no need for squashfs_lzma and squashfs3 now that support has been merged in the kernel
Diffstat (limited to 'lib/MDV')
| -rw-r--r-- | lib/MDV/Draklive/Loopback.pm | 6 |
1 files changed, 3 insertions, 3 deletions
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), |