From 18265de9d86dfe72532fd8d519d5897df9e7eead Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Tue, 5 Mar 2024 17:35:26 +0100 Subject: [PATCH] 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 --- build_library/disk_util | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_library/disk_util b/build_library/disk_util index b00e54d11ef..f94317e3c1d 100755 --- 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'])