Skip to content

Commit

Permalink
Default to zstd
Browse files Browse the repository at this point in the history
  • Loading branch information
vaeth committed Nov 15, 2017
1 parent 1bcb43b commit 53daecc
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# ChangeLog for squashmount

*squashmount-17.0.0
Martin Väth <martin at mvath.de>:
- IMPORTANT: New default for COMPRESSION is zstd.
This requires squashfs-tools-4.3.1_alpha20171114 or newer. Moreover:
zstd must be enabled for squashfs when you use the new default!
This is possible only with linux-4.14 or newer or with
squashfuse-0.1.101_alpha20170917 or newer.

*squashmount-16.1.0
Martin Väth <martin at mvath.de>:
- Document zstd on squashmount --man
Expand Down
11 changes: 6 additions & 5 deletions bin/squashmount
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
BEGIN { require 5.022 }
package Squashmount v16.1.0;
package Squashmount v17.0.0;

use strict;
use warnings;
Expand Down Expand Up @@ -1449,7 +1449,7 @@ B<squashmount print-changes ...>
The working directory required by overlay and overlayfs,
set according to the same rules as for B<CHANGES>.
If you want to use current versions of overlay or overlayfs
(kernel 3.15 or newer) this B<must> be on the same filesystem as B<CHANGES>.
(linux-3.15 or newer) this B<must> be on the same filesystem as B<CHANGES>.
If you do not want to use B<WORKDIR>, set B<$obsolete_overlayfs = 'force'>
and use only overlayfs (not overlay).

Expand Down Expand Up @@ -1653,9 +1653,10 @@ If the value is empty, no B<-comp> parameter is passed,
that is, the default of the installed B<mksquashfs> is chosen
(which is usually B<gzip> but might depend on your version of B<mksquashfs>).
The default of B<COMPRESSION> (that is, if undefined or not explicitly set)
is B<lz4>; note that before B<squashmount-10.0.0> this was B<xz>.
is B<zstd>; note that before B<squashmount>-17.0.0/10.0.0 this was
B<lz4>/B<xz>.
Note also that B<zstd>/B<lz4> support requires linux-4.14/3.19 or newer
(or squashfuse-0.1.101_alpha20170917/squash-0.1.100_alpha20140523 or newer).
(or squashfuse-0.1.101_alpha20170917/0.1.100_alpha20140523 or newer).

=item B<DEFAULT_FRAGMENTS>

Expand Down Expand Up @@ -3353,7 +3354,7 @@ sub mksquashfs_options {
defined($mksquash_symbols->{'i'}));
push(@$options, '-progress') if(defined($mksquash_symbols->{'p'}));
push(@$options, '-always-use-fragments') if(&is_nonempty($user_config->{'DEFAULT_FRAGMENTS'}));
my $comp = (defined($compression) ? lc($compression) : 'lz4');
my $comp = (defined($compression) ? lc($compression) : 'zstd');
my $compopt = $user_config->{'COMPOPT_' . uc($comp)};
unless(defined($compopt)) {
$compopt = ['-Xcompression-level', '22'] if($comp eq 'zstd');
Expand Down

0 comments on commit 53daecc

Please sign in to comment.