do not enforce lz4 compression everywhere

use default compression (now zstd) on init for /iocage and let zfs inheritance (or sysadmin) manage inheritance fix #26
freebsd · Sep 10, 2024 · 04133bd · 04133bd
1 parent 9c08450
commit 04133bd
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/iocage_lib/ioc_check.py b/iocage_lib/ioc_check.py
@@ -116,7 +116,6 @@ def __check_datasets__(self):
                     silent=self.silent)
 
                 dataset_options = {
-                    "compression": "lz4",
                     "aclmode": "passthrough",
                     "aclinherit": "passthrough"
                 }

diff --git a/iocage_lib/ioc_fetch.py b/iocage_lib/ioc_fetch.py
@@ -244,7 +244,7 @@ def fetch_release(self, _list=False):
                 pass
             else:
                 self.zpool.create_dataset({
-                    'name': pool_dataset, 'properties': {'compression': 'lz4'}
+                    'name': pool_dataset
                 })
 
             for f in self.files:
@@ -661,7 +661,7 @@ def fetch_download(self, _list, missing=False):
 
             ds = Dataset(dataset)
             if not ds.exists:
-                ds.create({'properties': {'compression': 'lz4'}})
+                ds.create()
             if not ds.mounted:
                 ds.mount()
 
@@ -810,7 +810,6 @@ def fetch_extract(self, f):
         if not os.path.isdir(dest):
             self.zpool.create_dataset({
                 'name': dataset, 'create_ancestors': True,
-                'properties': {'compression': 'lz4'},
             })
 
         with tarfile.open(src) as f:

diff --git a/iocage_lib/ioc_json.py b/iocage_lib/ioc_json.py
@@ -1243,7 +1243,7 @@ def retrieve_default_props():
             'sync_state': 'none',
             'sync_target': 'none',
             'sync_tgt_zpool': 'none',
-            'compression': 'lz4',
+            'compression': 'on',
             'origin': 'readonly',
             'quota': 'none',
             'mountpoint': 'readonly',
@@ -2190,7 +2190,6 @@ def json_check_prop(self, key, value, conf, default=False):
 
         zfs_props = {
             # ZFS Props
-            "compression": "lz4",
             "origin": "readonly",
             "quota": "none",
             "mountpoint": "readonly",

diff --git a/iocage_lib/ioc_start.py b/iocage_lib/ioc_start.py
@@ -320,7 +320,6 @@ def __start_jail__(self):
                 except su.CalledProcessError:
                     iocage_lib.ioc_common.checkoutput(
                         ["zfs", "create", "-o",
-                         "compression=lz4", "-o",
                          "mountpoint=none",
                          f"{self.pool}/{jdataset}"],
                         stderr=su.STDOUT)