boot config should be looking in /boot for kernel and initrd.
This commit is contained in:
parent
ba50228619
commit
589f119c24
|
|
@ -0,0 +1,33 @@
|
||||||
|
From: James Pace <jpace121@gmail.com>
|
||||||
|
Date: Mon, 26 Dec 2022 13:20:09 -0500
|
||||||
|
Subject: Boot config should be looking in /boot.
|
||||||
|
|
||||||
|
---
|
||||||
|
src/libostree/ostree-sysroot-deploy.c | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
|
||||||
|
index 26b07080..8e86d296 100644
|
||||||
|
--- a/src/libostree/ostree-sysroot-deploy.c
|
||||||
|
+++ b/src/libostree/ostree-sysroot-deploy.c
|
||||||
|
@@ -2032,7 +2032,7 @@ install_deployment_kernel (OstreeSysroot *sysroot,
|
||||||
|
|
||||||
|
g_autofree char *version_key = g_strdup_printf ("%d", n_deployments - ostree_deployment_get_index (deployment));
|
||||||
|
ostree_bootconfig_parser_set (bootconfig, OSTREE_COMMIT_META_KEY_VERSION, version_key);
|
||||||
|
- g_autofree char * boot_relpath = g_strconcat ("/", bootcsumdir, "/", kernel_layout->kernel_namever, NULL);
|
||||||
|
+ g_autofree char * boot_relpath = g_strconcat ("/boot/", bootcsumdir, "/", kernel_layout->kernel_namever, NULL);
|
||||||
|
ostree_bootconfig_parser_set (bootconfig, "linux", boot_relpath);
|
||||||
|
|
||||||
|
val = ostree_bootconfig_parser_get (bootconfig, "options");
|
||||||
|
@@ -2041,7 +2041,7 @@ install_deployment_kernel (OstreeSysroot *sysroot,
|
||||||
|
if (kernel_layout->initramfs_namever)
|
||||||
|
{
|
||||||
|
g_autofree char * initrd_boot_relpath =
|
||||||
|
- g_strconcat ("/", bootcsumdir, "/", kernel_layout->initramfs_namever, NULL);
|
||||||
|
+ g_strconcat ("/boot/", bootcsumdir, "/", kernel_layout->initramfs_namever, NULL);
|
||||||
|
ostree_bootconfig_parser_set (bootconfig, "initrd", initrd_boot_relpath);
|
||||||
|
|
||||||
|
if (overlay_initrds)
|
||||||
|
--
|
||||||
|
2.39.0
|
||||||
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
configure-use-pkg-config-with-newer-gpgme-and-gpg-error.patch
|
configure-use-pkg-config-with-newer-gpgme-and-gpg-error.patch
|
||||||
debian/Skip-test-pull-repeated-during-CI.patch
|
debian/Skip-test-pull-repeated-during-CI.patch
|
||||||
debian/test-sysroot-Skip-on-s390x-by-default.patch
|
debian/test-sysroot-Skip-on-s390x-by-default.patch
|
||||||
|
debian/boot-config-should-be-looking-in-boot.patch
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue