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 <jpiotrowski@microsoft.com>
This commit is contained in:
Jeremi Piotrowski 2024-03-05 17:35:26 +01:00
parent a2aa30f487
commit 18265de9d8

View File

@ -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'])