Merge remote-tracking branch 'origin/3.3-devel' into 3.3-release

storaged-project · Feb 18, 2021 · 3fe3fdd · 3fe3fdd
2 parents 0cb854e + 724855f
commit 3fe3fdd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py
@@ -494,11 +494,18 @@ def _set_format(self, fmt):
 
         # propagate mount options specified for members via kickstart
         opts = "subvol=%s" % self.name
+        has_compress = False
         if self.volume.format.mountopts:
             for opt in self.volume.format.mountopts.split(","):
                 # do not add members subvol spec
                 if not opt.startswith("subvol"):
                     opts += ",%s" % opt
+                if opt.startswith("compress"):
+                    has_compress = True
+
+        # add default compression settings
+        if flags.btrfs_compression and not has_compress:
+            opts += ",compress=%s" % flags.btrfs_compression
 
         self.format.mountopts = opts
 

diff --git a/blivet/flags.py b/blivet/flags.py
@@ -81,6 +81,10 @@ def __init__(self):
 
         self.update_from_boot_cmdline()
         self.allow_imperfect_devices = True
+
+        # compression option for btrfs filesystems
+        self.btrfs_compression = None
+
         self.debug_threads = False
 
     def get_boot_cmdline(self):