diff options
author | Julia Kreger <juliaashleykreger@gmail.com> | 2023-01-03 16:40:16 -0800 |
---|---|---|
committer | Julia Kreger <juliaashleykreger@gmail.com> | 2023-01-11 06:59:45 -0800 |
commit | 2f4a156d2995387f944942bd769d17eca623d36a (patch) | |
tree | d9d32b1c0b71775be7b76012d04fdc3aa917f770 | |
parent | 1d07be823782eca4706f474702e37b3515bcff40 (diff) | |
download | ironic-2f4a156d2995387f944942bd769d17eca623d36a.tar.gz |
Fix grub config path default
Grub2 looks for files in different paths depending on the boot mode
of the binary. Previously the grub_config_path setting was defaulted
to the path used exclusively for BIOS booting, which meant anyone
using it had to override the setting. Now, we've set the default
to the default for UEFI booting, and the world should be a happier,
and less override filled place.
Change-Id: Id6723e92efb62f8ca03099f15c90580cec887ddd
-rw-r--r-- | ironic/conf/default.py | 2 | ||||
-rw-r--r-- | releasenotes/notes/fix-grub2-uefi-config-path-f1b4c5083cc97ee5.yaml | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/ironic/conf/default.py b/ironic/conf/default.py index 0e3c32bd1..c7aff69cc 100644 --- a/ironic/conf/default.py +++ b/ironic/conf/default.py @@ -216,7 +216,7 @@ image_opts = [ 'common/isolinux_config.template'), help=_('Template file for isolinux configuration file.')), cfg.StrOpt('grub_config_path', - default='/boot/grub/grub.cfg', + default='EFI/BOOT/grub.cfg', help=_('GRUB2 configuration file location on the UEFI ISO ' 'images produced by ironic. The default value is ' 'usually incorrect and should not be relied on. ' diff --git a/releasenotes/notes/fix-grub2-uefi-config-path-f1b4c5083cc97ee5.yaml b/releasenotes/notes/fix-grub2-uefi-config-path-f1b4c5083cc97ee5.yaml new file mode 100644 index 000000000..ddb6c86cb --- /dev/null +++ b/releasenotes/notes/fix-grub2-uefi-config-path-f1b4c5083cc97ee5.yaml @@ -0,0 +1,14 @@ +--- +fixes: + - | + Fixes the default value for the ``[DEFAULT]grub_config_path`` variable to + be the default path for UEFI bootloader configurations, where as the + default was previously the BIOS grub2 configuration path. +upgrades: + - | + The default configuration value for ``[DEFAULT]grub_config_path`` has + been changed from ``/boot/grub/grub.conf`` to ``EFI/BOOT/grub.efi`` as + the configuration parameter was for UEFI boot configuration, and the + ``/boot/grub/grub2.conf`` path is for BIOS booting. This was verified + by referencing several working UEFI virtual media examples where this + value was overridden to the new configuration value. |