Merge pull request os-autoinst#18227 from rfan1/btrfs_cache

Remove 'space_cache' option for btrfs
pablo-herranz · Dec 1, 2023 · 1710928 · 1710928
2 parents d689a89 + 505cfe1
commit 1710928
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/data/yam/autoyast/btrfs.xml b/data/yam/autoyast/btrfs.xml
@@ -76,7 +76,7 @@
           <crypt_fs config:type="boolean">false</crypt_fs>
           <filesystem config:type="symbol">btrfs</filesystem>
           <format config:type="boolean">true</format>
-          <fstopt>rw,relatime,space_cache</fstopt>
+          <fstopt>rw,relatime</fstopt>
           <loop_fs config:type="boolean">false</loop_fs>
           <mount>/</mount>
           <mountby config:type="symbol">uuid</mountby>

diff --git a/test_data/yast/autoyast/profiles/btrfs.yaml b/test_data/yast/autoyast/profiles/btrfs.yaml
@@ -8,7 +8,7 @@ profile:
             - mount: swap
             - mount: /
               subvolumes_prefix: ''
-              fstopt: rw,relatime,space_cache
+              fstopt: rw,relatime
               subvolumes:
                 subvolume:
                   - path: usr/local

diff --git a/tests/autoyast/verify_btrfs.pm b/tests/autoyast/verify_btrfs.pm
@@ -16,7 +16,7 @@ sub run {
 
     ### Verify mounted drives ###
     # Common part of regexp
-    my $common_opts = qr/rw|relatime|space_cache|subvolid=\d+/;
+    my $common_opts = qr/rw|relatime|discard=async|space_cache=v2|subvolid=\d+/;
 
     # Get verify mount options for root
     validate_script_output "findmnt / -no OPTIONS", sub {