openstack/diskimage-builder
Code Issues Proposed changes

Merge "bootloader: Strip prior console settings"

Browse Source
This commit is contained in:
Zuul 2024-07-04 03:18:37 +00:00 committed by Gerrit Code Review
commit 55c8644ef3
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
diskimage_builder/elements/bootloader/finalise.d/50-bootloader
View File

@ -87,6 +87,16 @@ if [[ -L $GRUBENV ]]; then
rm -f $GRUBENV rm -f $GRUBENV
fi fi
# NOTE(TheJulia): Explicitly strip out embedded console settings
# in the source's grub defaults. This prevents re-introduction later.
# Intentionally matching 'console=ttyS0,115200n8 console=tty0'
# Also globally matches so it can handle 'console=tty0 stuff console=tty1'
# ... and also matches
# 'console=ttyS0,112500n81 console=ttyS1,n8 console=tty0'
if [[ -f /etc/default/grub ]]; then
sed -i 's/\<console=[[:alnum:],]*[[:space:]]*//g' /etc/default/grub
fi
echo "GRUB_DEVICE=LABEL=${DIB_ROOT_LABEL}" >> /etc/default/grub echo "GRUB_DEVICE=LABEL=${DIB_ROOT_LABEL}" >> /etc/default/grub
echo 'GRUB_DISABLE_LINUX_UUID=true' >> /etc/default/grub echo 'GRUB_DISABLE_LINUX_UUID=true' >> /etc/default/grub
echo "GRUB_TIMEOUT=${DIB_GRUB_TIMEOUT:-5}" >>/etc/default/grub echo "GRUB_TIMEOUT=${DIB_GRUB_TIMEOUT:-5}" >>/etc/default/grub

7
releasenotes/notes/bootloader-strip-source-console-param-b73b603df0b01dc9.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
The ``bootloader`` element now strips prior explicit console settings
from the ``/etc/default/grub`` file, in order to prevent accidential
re-introduction of prior settings when grub configuration is manually
updated later.