openstack/diskimage-builder
Code Issues Proposed changes

Merge "Added missing grubby arg DIB_BOOTLOADER_DEFAULT_CMDLINE"

Browse Source
This commit is contained in:
Zuul
2021-11-24 22:30:43 +00:00
committed by Gerrit Code Review
parent 583b594ad4 5a4e8a2c9e
commit 11d25f76d2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -196,7 +196,7 @@ fi
GRUB_CMDLINE_LINUX_DEFAULT="console=tty0 console=${SERIAL_CONSOLE} no_timer_check"
if [ -n "$USE_GRUBBY" ]; then
grubby --update-kernel=ALL --args="$GRUB_CMDLINE_LINUX_DEFAULT"
grubby --update-kernel=ALL --args="${GRUB_CMDLINE_LINUX_DEFAULT} ${DIB_BOOTLOADER_DEFAULT_CMDLINE}"
else
echo "GRUB_CMDLINE_LINUX_DEFAULT=\"${GRUB_CMDLINE_LINUX_DEFAULT} ${DIB_BOOTLOADER_DEFAULT_CMDLINE}\"" >>/etc/default/grub
fi