From 724855ff0c30eacab3448f66c6076151ed565e89 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mon, 15 Feb 2021 20:55:18 -0800 Subject: [PATCH] apply compression settings from blivet.flags.btrfs_compression (#1926892) If `blivet.flags.btrfs_compression` is set, and unless `compress=` is already explicitly set, apply it to mount options. Signed-off-by: Michel Alexandre Salim --- blivet/devices/btrfs.py | 7 +++++++ blivet/flags.py | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py index edb82478c..da652af89 100644 --- 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 index 6500be305..0140a4a5a 100644 --- 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):