Release 0.2.18

backport patch to support GRUB console.cfg
Resolves: RHEL-26439
This commit is contained in:
Joseph Marrero 2024-02-22 13:17:41 -05:00
parent 2896a05e8f
commit 219b5823bd
4 changed files with 43 additions and 3 deletions

2
.gitignore vendored
View File

@ -25,3 +25,5 @@
/bootupd-0.2.16-vendor.tar.zstd /bootupd-0.2.16-vendor.tar.zstd
/bootupd-0.2.17.crate /bootupd-0.2.17.crate
/bootupd-0.2.17-vendor.tar.zstd /bootupd-0.2.17-vendor.tar.zstd
/bootupd-0.2.18.crate
/bootupd-0.2.18-vendor.tar.zstd

View File

@ -0,0 +1,31 @@
From 38b971647d126f9c51545553d2a55cc77ff01d08 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Mon, 19 Feb 2024 14:33:17 -0500
Subject: [PATCH] grub2: source in a console.cfg file if exists
This will allow users or distro builders place console settings
here that will get picked up on boot. This was discussed as part
of https://github.com/coreos/fedora-coreos-tracker/issues/1671
---
src/grub2/grub-static-pre.cfg | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/grub2/grub-static-pre.cfg b/src/grub2/grub-static-pre.cfg
index 7784834..9717cfb 100644
--- a/src/grub2/grub-static-pre.cfg
+++ b/src/grub2/grub-static-pre.cfg
@@ -38,6 +38,11 @@ elif [ -s $prefix/grubenv ]; then
load_env
fi
+if [ -f $prefix/console.cfg ]; then
+ # Source in any GRUB console settings if provided by the user/platform
+ source $prefix/console.cfg
+fi
+
if [ x"${feature_menuentry_id}" = xy ]; then
menuentry_id_option="--id"
else
--
2.43.0

View File

@ -4,7 +4,7 @@
%global crate bootupd %global crate bootupd
Name: rust-%{crate} Name: rust-%{crate}
Version: 0.2.17 Version: 0.2.18
Release: 1%{?dist} Release: 1%{?dist}
Summary: Bootloader updater Summary: Bootloader updater
@ -13,6 +13,8 @@ URL: https://crates.io/crates/bootupd
Source0: https://github.com/coreos/bootupd/releases/download/v%{version}/bootupd-%{version}.crate Source0: https://github.com/coreos/bootupd/releases/download/v%{version}/bootupd-%{version}.crate
Source1: https://github.com/coreos/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.zstd Source1: https://github.com/coreos/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.zstd
Patch0: 0001-grub2-source-in-a-console.cfg-file-if-exists.patch
BuildRequires: make BuildRequires: make
BuildRequires: openssl-devel BuildRequires: openssl-devel
%if 0%{?rhel} && !0%{?eln} %if 0%{?rhel} && !0%{?eln}
@ -70,6 +72,11 @@ make install-grub-static DESTDIR=%{?buildroot} INSTALL="%{__install} -p"
%systemd_postun bootupd.service bootupd.socket %systemd_postun bootupd.service bootupd.socket
%changelog %changelog
* Thu Feb 22 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 0.2.18-1
- https://github.com/coreos/bootupd/releases/tag/v0.2.18
backport patch to support GRUB console.cfg
Resolves: RHEL-26439
* Tue Dec 19 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 0.2.17-1 * Tue Dec 19 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 0.2.17-1
- https://github.com/coreos/bootupd/releases/tag/v0.2.17 - https://github.com/coreos/bootupd/releases/tag/v0.2.17
Resolves: RHEL-14388 Resolves: RHEL-14388

View File

@ -1,2 +1,2 @@
SHA512 (bootupd-0.2.17.crate) = b99130fab8db52318a4bae9bba4b32b6193a4308c7341828b00b135dbf9736fbdcb11aa4769220d5b62a29c8f9da2ae4e89752753b6da5e096ee6d3140f096b5 SHA512 (bootupd-0.2.18.crate) = 867579ca1978453c14761023abb3ab5fd6d5fffc721e1544d55d5b4e14d5ba374fcf5ed7a53b45d176c3853fb1c0dd715fbd6e7d3652e6ad24ee0de6376a634b
SHA512 (bootupd-0.2.17-vendor.tar.zstd) = 1e8d895d59457cb014bd4c375aeae8b35222371e6885bc367e5881408578c804c281a353c74bee1290aa800a3062a36e98dfaab311b38c83f5ae9e898f3d7579 SHA512 (bootupd-0.2.18-vendor.tar.zstd) = c194054b14d8038dc06d4cfa7f4138a0b1a1b5f45aab09df402e55d3fe912fd91f43306dae44878edcfab03196acf3b4d656c66cb8aaa4638a6269b922d3dca7