mkfs-util: Add support for btrfs compression

Corresponding PR in btrfs-progs: https://github.com/kdave/btrfs-progs/pull/882

diff --git a/man/repart.d.xml b/man/repart.d.xml
index 8e3d496ab2192d010b5cd03da5b5221388f235aa..2f933efdae79105f8855c0d9a608ae293b68ec83 100644 (file)
--- a/man/repart.d.xml
+++ b/man/repart.d.xml
@@ -877,6 +877,12 @@
                 <entry>lz4, lz4hc, lzma, deflate, libdeflate, zstd</entry>
                 <entry><member><citerefentry project='man-pages'><refentrytitle>mkfs.erofs</refentrytitle><manvolnum>1</manvolnum></citerefentry></member></entry>
               </row>
+
+              <row>
+                <entry><constant>btrfs</constant></entry>
+                <entry>zlib, lzo, zstd</entry>
+                <entry><member><citerefentry project='man-pages'><refentrytitle>mkfs.btrfs</refentrytitle><manvolnum>8</manvolnum></citerefentry></member></entry>
+              </row>
             </tbody>
           </tgroup>
         </table>

diff --git a/src/shared/mkfs-util.c b/src/shared/mkfs-util.c
index 87c7d52a979439a5a78abffa5aaff73684bd1849..46fa685b0d60bb5627111656a3f5b1f83e6c077e 100644 (file)
--- a/src/shared/mkfs-util.c
+++ b/src/shared/mkfs-util.c
@@ -461,6 +461,20 @@ int make_filesystem(
                 if (quiet && strv_extend(&argv, "-q") < 0)
                         return log_oom();
 
+                if (compression) {
+                        _cleanup_free_ char *c = NULL;
+
+                        c = strdup(compression);
+                        if (!c)
+                                return log_oom();
+
+                        if (compression_level && !strextend(&c, ":", compression_level))
+                                return log_oom();
+
+                        if (strv_extend_many(&argv, "--compress", c) < 0)
+                                return log_oom();
+                }
+
                 /* mkfs.btrfs unconditionally warns about several settings changing from v5.15 onwards which
                  * isn't silenced by "-q", so let's redirect stdout to /dev/null as well. */
                 if (quiet)