diff options
| author | Zuul <zuul@review.opendev.org> | 2023-01-27 22:09:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-01-27 22:09:15 +0000 |
| commit | e73c3c9c227eb71d760858ad1425fa82e9e9fe8a (patch) | |
| tree | 232dedc42c62d9563a1b3fe3f94e16b177a61255 | |
| parent | c741be66281e38245bd0d1a832c930d738f214b6 (diff) | |
| parent | 2f4a156d2995387f944942bd769d17eca623d36a (diff) | |
| download | ironic-e73c3c9c227eb71d760858ad1425fa82e9e9fe8a.tar.gz | |
Merge "Fix grub config path default"21.3.0
| -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. |