Skip to content

feat: upstream patch of using linux instead of linuxefi in grub config #1131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 7, 2025
Merged

feat: upstream patch of using linux instead of linuxefi in grub config #1131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions containers/ironic/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ RUN apt-get update && \
apt-get install -y --no-install-recommends \
genisoimage \
isolinux \
patch \
quilt \
&& apt-get clean && rm -rf /var/lib/apt/lists/*

RUN --mount=type=cache,target=/root/.cache/pip \
Expand All @@ -27,3 +29,6 @@ RUN --mount=type=cache,target=/root/.cache/pip \
ironic-understack \
understack-flavor-matcher \
sushy-oem-idrac==6.0.0
COPY containers/ironic/patches /tmp/patches/
RUN cd /var/lib/openstack/lib/python3.10/site-packages && \
QUILT_PATCHES=/tmp/patches quilt push -a
197 changes: 197 additions & 0 deletions containers/ironic/patches/0001_grub_config.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,197 @@
From 27bd04925748a66866011a68eb0e26f23cedbcfa Mon Sep 17 00:00:00 2001
From: Riccardo Pittau <elfosardo@gmail.com>
Date: Tue, 29 Oct 2024 09:05:05 +0100
Subject: [PATCH] Use linux instead of linuxefi in grub config

The EFI handover protocol has been deprecated since a while
and recently moved to be optional and enabled by default [1].
As a consequence, the linuxefi and initrdefi binaries that
were specifically compiled to use that option, are
also deprecated and they have been removed in most of
the recent linux distributions in favor of the generic
linux and initrd that are now compatible with UEFI boot.
This patch changes linuxefi to linux and initrdefi to
initrd in all the grub templates, using the generic
entries for all the platform architectures.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cc3fdda2876e58a7e83e558ab51853cf106afb6a

Closes-Bug: #2081305
Change-Id: Ie5b2265d7afc8b71fabfca6ca6687e0e34ce3b5b
---

diff --git a/ironic/common/grub_conf.template b/ironic/common/grub_conf.template
index 2a979d2..480c6e8 100644
--- a/ironic/common/grub_conf.template
+++ b/ironic/common/grub_conf.template
@@ -3,6 +3,6 @@
set hidden_timeout_quiet=false

menuentry "boot_partition" {
-linuxefi {{ linux }} {{ kernel_params }} --
-initrdefi {{ initrd }}
+linux {{ linux }} {{ kernel_params }} --
+initrd {{ initrd }}
}
diff --git a/ironic/common/pxe_utils.py b/ironic/common/pxe_utils.py
index 1726d73..9896a5b 100644
--- a/ironic/common/pxe_utils.py
+++ b/ironic/common/pxe_utils.py
@@ -351,11 +351,9 @@
pxe_config_root_tag = '(( ROOT ))'
pxe_config_disk_ident = '(( DISK_IDENTIFIER ))'

- # Determine the appropriate commands based on the CPU architecture
- arch = task.node.properties.get('cpu_arch', 'x86_64')
commands = {
- 'linux_cmd': 'linuxefi' if arch != 'aarch64' else 'linux',
- 'initrd_cmd': 'initrdefi' if arch != 'aarch64' else 'initrd'
+ 'linux_cmd': 'linux',
+ 'initrd_cmd': 'initrd'
}
pxe_options.update(commands)
else:
diff --git a/ironic/drivers/modules/pxe_grub_config.template b/ironic/drivers/modules/pxe_grub_config.template
index 93a0869..59686fe 100644
--- a/ironic/drivers/modules/pxe_grub_config.template
+++ b/ironic/drivers/modules/pxe_grub_config.template
@@ -3,20 +3,20 @@
set hidden_timeout_quiet=false

menuentry "deploy" {
- {{ pxe_options.linux_cmd|default('linuxefi', true) }} {{ pxe_options.deployment_aki_path }} selinux=0 troubleshoot=0 text {{ pxe_options.pxe_append_params|default("", true) }} boot_server={{pxe_options.tftp_server}}
- {{ pxe_options.initrd_cmd|default('initrdefi', true) }} {{ pxe_options.deployment_ari_path }}
+ {{ pxe_options.linux_cmd|default('linux', true) }} {{ pxe_options.deployment_aki_path }} selinux=0 troubleshoot=0 text {{ pxe_options.pxe_append_params|default("", true) }} boot_server={{pxe_options.tftp_server}}
+ {{ pxe_options.initrd_cmd|default('initrd', true) }} {{ pxe_options.deployment_ari_path }}
}

menuentry "boot_ramdisk" {
- {{ pxe_options.linux_cmd|default('linuxefi', true) }} {{ pxe_options.aki_path }} root=/dev/ram0 text {{ pxe_options.pxe_append_params|default("", true) }} {{ pxe_options.ramdisk_opts|default('', true) }}
- {{ pxe_options.initrd_cmd|default('initrdefi', true) }} {{ pxe_options.ari_path }}
+ {{ pxe_options.linux_cmd|default('linux', true) }} {{ pxe_options.aki_path }} root=/dev/ram0 text {{ pxe_options.pxe_append_params|default("", true) }} {{ pxe_options.ramdisk_opts|default('', true) }}
+ {{ pxe_options.initrd_cmd|default('initrd', true) }} {{ pxe_options.ari_path }}
}

menuentry "boot_whole_disk" {
- {{ pxe_options.linux_cmd|default('linuxefi', true) }} chain.c32 mbr:{{ DISK_IDENTIFIER }}
+ {{ pxe_options.linux_cmd|default('linux', true) }} chain.c32 mbr:{{ DISK_IDENTIFIER }}
}

menuentry "boot_anaconda" {
- {{ pxe_options.linux_cmd|default('linuxefi', true) }} {{ pxe_options.aki_path }} text {{ pxe_options.pxe_append_params|default("", true) }} inst.ks={{ pxe_options.ks_cfg_url }} {% if pxe_options.repo_url %}inst.repo={{ pxe_options.repo_url }}{% else %}inst.stage2={{ pxe_options.stage2_url }}{% endif %}
- {{ pxe_options.initrd_cmd|default('initrdefi', true) }} {{ pxe_options.ari_path }}
+ {{ pxe_options.linux_cmd|default('linux', true) }} {{ pxe_options.aki_path }} text {{ pxe_options.pxe_append_params|default("", true) }} inst.ks={{ pxe_options.ks_cfg_url }} {% if pxe_options.repo_url %}inst.repo={{ pxe_options.repo_url }}{% else %}inst.stage2={{ pxe_options.stage2_url }}{% endif %}
+ {{ pxe_options.initrd_cmd|default('initrd', true) }} {{ pxe_options.ari_path }}
}
diff --git a/ironic/tests/unit/common/test_images.py b/ironic/tests/unit/common/test_images.py
index 99b1652..102c927 100644
--- a/ironic/tests/unit/common/test_images.py
+++ b/ironic/tests/unit/common/test_images.py
@@ -654,8 +654,8 @@
"set hidden_timeout_quiet=false\n"
"\n"
"menuentry \"boot_partition\" {\n"
- "linuxefi /vmlinuz key1=value1 key2 --\n"
- "initrdefi /initrd\n"
+ "linux /vmlinuz key1=value1 key2 --\n"
+ "initrd /initrd\n"
"}")

cfg = images._generate_cfg(kernel_params,
diff --git a/ironic/tests/unit/common/test_pxe_utils.py b/ironic/tests/unit/common/test_pxe_utils.py
index 50cfb5e..d31ee21 100644
--- a/ironic/tests/unit/common/test_pxe_utils.py
+++ b/ironic/tests/unit/common/test_pxe_utils.py
@@ -166,23 +166,7 @@

self.assertEqual(str(expected_template), rendered_template)

- def test_pxe_config_x86_64(self):
- self.node.properties['cpu_arch'] = 'x86_64'
- self.node.save()
-
- rendered_template = utils.render_template(
- CONF.pxe.uefi_pxe_config_template,
- {'pxe_options': self.pxe_options,
- 'ROOT': '{{ ROOT }}',
- 'DISK_IDENTIFIER': '{{ DISK_IDENTIFIER }}'})
-
- self.assertIn('linuxefi', rendered_template)
- self.assertIn('initrdefi', rendered_template)
-
- def test_pxe_config_aarch64(self):
- self.node.properties['cpu_arch'] = 'aarch64'
- self.node.save()
-
+ def test_pxe_config(self):
rendered_template = utils.render_template(
CONF.pxe.uefi_pxe_config_template,
{'pxe_options': self.pxe_options,
diff --git a/ironic/tests/unit/drivers/modules/test_deploy_utils.py b/ironic/tests/unit/drivers/modules/test_deploy_utils.py
index cb9ec1b..171bdca 100644
--- a/ironic/tests/unit/drivers/modules/test_deploy_utils.py
+++ b/ironic/tests/unit/drivers/modules/test_deploy_utils.py
@@ -159,12 +159,12 @@
set hidden_timeout_quiet=false

menuentry "deploy" {
- linuxefi deploy_kernel "ro text"
- initrdefi deploy_ramdisk
+ linux deploy_kernel "ro text"
+ initrd deploy_ramdisk
}

menuentry "boot_whole_disk" {
- linuxefi chain.c32 mbr:(( DISK_IDENTIFIER ))
+ linux chain.c32 mbr:(( DISK_IDENTIFIER ))
}
"""

@@ -174,12 +174,12 @@
set hidden_timeout_quiet=false

menuentry "deploy" {
- linuxefi deploy_kernel "ro text"
- initrdefi deploy_ramdisk
+ linux deploy_kernel "ro text"
+ initrd deploy_ramdisk
}

menuentry "boot_whole_disk" {
- linuxefi chain.c32 mbr:0x12345678
+ linux chain.c32 mbr:0x12345678
}
"""

diff --git a/ironic/tests/unit/drivers/pxe_grub_config.template b/ironic/tests/unit/drivers/pxe_grub_config.template
index 95716cb..6caa0dd 100644
--- a/ironic/tests/unit/drivers/pxe_grub_config.template
+++ b/ironic/tests/unit/drivers/pxe_grub_config.template
@@ -3,20 +3,20 @@
set hidden_timeout_quiet=false

menuentry "deploy" {
- linuxefi /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/deploy_kernel selinux=0 troubleshoot=0 text test_param boot_server=192.0.2.1
- initrdefi /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/deploy_ramdisk
+ linux /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/deploy_kernel selinux=0 troubleshoot=0 text test_param boot_server=192.0.2.1
+ initrd /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/deploy_ramdisk
}

menuentry "boot_ramdisk" {
- linuxefi /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/kernel root=/dev/ram0 text test_param ramdisk_param
- initrdefi /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/ramdisk
+ linux /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/kernel root=/dev/ram0 text test_param ramdisk_param
+ initrd /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/ramdisk
}

menuentry "boot_whole_disk" {
- linuxefi chain.c32 mbr:(( DISK_IDENTIFIER ))
+ linux chain.c32 mbr:(( DISK_IDENTIFIER ))
}

menuentry "boot_anaconda" {
- linuxefi /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/kernel text test_param inst.ks=http://fake/ks.cfg inst.stage2=http://fake/stage2
- initrdefi /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/ramdisk
+ linux /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/kernel text test_param inst.ks=http://fake/ks.cfg inst.stage2=http://fake/stage2
+ initrd /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/ramdisk
}
1 change: 1 addition & 0 deletions containers/ironic/patches/series
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0001_grub_config.patch
Loading