From 18265de9d86dfe72532fd8d519d5897df9e7eead Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Tue, 5 Mar 2024 17:35:26 +0100 Subject: [PATCH 1/2] 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 b00e54d11e..f94317e3c1 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']) From 24d88e2f616b906835d18d7f7ab2497dacb060b8 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Tue, 12 Mar 2024 10:54:44 +0100 Subject: [PATCH 2/2] coreos-base/update_engine: Switch to rescue=nologreplay btrfs option 'norecovery' was deprecated and has been removed in kernel v6.8 so switch to the new way of doing things. This pulls in https://github.com/flatcar/update_engine/pull/40. Signed-off-by: Jeremi Piotrowski --- ...engine-0.4.10-r21.ebuild => update_engine-0.4.10-r22.ebuild} | 0 .../coreos-base/update_engine/update_engine-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.4.10-r21.ebuild => update_engine-0.4.10-r22.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r21.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r22.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r21.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r22.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild index 48cb9e4a5c..cc6ed4c042 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild @@ -8,7 +8,7 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="f627c4def9ff42cc6bf4b04cf211e11a42b34f31" # flatcar-master + CROS_WORKON_COMMIT="541576a4dcd56397597abef7d9ce4c539631ed65" # flatcar-master KEYWORDS="amd64 arm64" fi