disk_util: Mount btrfs fs with rescue= option

It looks like 'norecovery' is deprecated and has been removed in the v6.8-rc1 kernel. Replace it with 'rescue=nologreplay', which is a replacement implemented since v5.9. The standalone 'nologreplay' option is also deprecated. Signed-off-by: Jeremi Piotrowski <[email protected]>
flatcar · Mar 5, 2024 · 18265de · 18265de
1 parent a2aa30f
commit 18265de
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/build_library/disk_util b/build_library/disk_util
@@ -603,7 +603,7 @@ def Mount(options):
     if options.read_only or ('verity' in mount.get('features', []) and not options.writable_verity):
       mount_opts.append('ro')
       if mount.get('fs_type', None) == 'btrfs':
-        mount_opts.append('norecovery')
+        mount_opts.append('rescue=nologreplay')
 
     if mount.get('fs_subvolume', None):
       mount_opts.append('subvol=%s' % mount['fs_subvolume'])