rpms/ostree
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Backport https://github.com/ostreedev/ostree/pull/3493

Browse Source 
Resolves: #RHEL-107855
This commit is contained in:
Joseph Marrero Corchado 2025-08-06 10:33:04 -04:00
parent c3f200ca86
commit 3dfbc59cb9
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
0001-deploy-Fix-path-to-aboot.cfg-in-BLS-files.patch Normal file
View File

@ -0,0 +1,35 @@
From 36995ef2b6dff343434016433a46242861549edd Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Wed, 6 Aug 2025 12:16:34 +0200
Subject: [PATCH] deploy: Fix path to aboot.cfg in BLS files
The change in https://github.com/ostreedev/ostree/pull/3413/ was meant
to change when the abootcfg option is set in the BLS file. However,
it also changed the value of this key, using the wrong directory
(bootcsumdir instead of /usr/lib/ostree-boot).
This means that during update, aboot-update gets the wrong path to the
config and cannot correctly write the aboot partition.
Signed-off-by: Alexander Larsson <alexl@redhat.com>
---
src/libostree/ostree-sysroot-deploy.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index bee899a3..e8f3ece5 100644
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -2134,7 +2134,8 @@ install_deployment_kernel (OstreeSysroot *sysroot, int new_bootversion,
g_autofree char *aboot_relpath = g_strconcat ("/", bootcsumdir, "/", aboot_fn, NULL);
ostree_bootconfig_parser_set (bootconfig, "aboot", aboot_relpath);
- g_autofree char *abootcfg_relpath = g_strconcat ("/", bootcsumdir, "/aboot.cfg", NULL);
+ g_autofree char *abootcfg_relpath
+ = g_strconcat ("/", deployment_dirpath, "/usr/lib/ostree-boot/aboot.cfg", NULL);
ostree_bootconfig_parser_set (bootconfig, "abootcfg", abootcfg_relpath);
}
--
2.50.1

8
ostree.spec
View File

@ -8,11 +8,13 @@
Summary: Tool for managing bootable, immutable filesystem trees
Name: ostree
Version: 2025.4
Release: 1%{?dist}
Release: 2%{?dist}
Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz
Source1: ostree-readonly-sysroot-migration
Source2: ostree-readonly-sysroot-migration.service
Patch0: 0001-deploy-Fix-path-to-aboot.cfg-in-BLS-files.patch
License: LGPLv2+
URL: https://ostree.readthedocs.io/en/latest/
@ -179,6 +181,10 @@ find %{buildroot} -name '*.la' -delete
%endif
%changelog
* Wed Aug 06 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 2025.4-2
- Backport https://github.com/ostreedev/ostree/pull/3493
Resolves: #RHEL-107855
* Fri Jul 11 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 2025.4-1
- Rebase to https://github.com/ostreedev/ostree/releases/tag/v2025.4
Resolves: #RHEL-104888