mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-21 05:31:05 +02:00
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:
parent
a2aa30f487
commit
18265de9d8
@ -603,7 +603,7 @@ def Mount(options):
|
|||||||
if options.read_only or ('verity' in mount.get('features', []) and not options.writable_verity):
|
if options.read_only or ('verity' in mount.get('features', []) and not options.writable_verity):
|
||||||
mount_opts.append('ro')
|
mount_opts.append('ro')
|
||||||
if mount.get('fs_type', None) == 'btrfs':
|
if mount.get('fs_type', None) == 'btrfs':
|
||||||
mount_opts.append('norecovery')
|
mount_opts.append('rescue=nologreplay')
|
||||||
|
|
||||||
if mount.get('fs_subvolume', None):
|
if mount.get('fs_subvolume', None):
|
||||||
mount_opts.append('subvol=%s' % mount['fs_subvolume'])
|
mount_opts.append('subvol=%s' % mount['fs_subvolume'])
|
||||||
|
Loading…
x
Reference in New Issue
Block a user