From 20384091ffb1fd075de139067027707f45c71b5a Mon Sep 17 00:00:00 2001 From: Robbie Harwood Date: Tue, 19 Jul 2022 19:28:09 +0000 Subject: [PATCH] Clarify that grub files aren't used on s390x in man page Resolves: #2105118 Signed-off-by: Robbie Harwood --- grubby.8 | 3 ++- grubby.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/grubby.8 b/grubby.8 index 9bcd247..1c06017 100644 --- a/grubby.8 +++ b/grubby.8 @@ -148,7 +148,8 @@ the only items that can be updated is the kernel argument list, which is modified via the \fB-\-args\fR and \fB-\-remove-args\fR options. If the \fBALL\fR argument is used the variable \fB GRUB_CMDLINE_LINUX\fR in \fB/etc/default/grub\fR is updated with the latest kernel argument list, -unless the \fB-\-no-etc-grub-update\fR option is used. +unless the \fB-\-no-etc-grub-update\fR option is used or the file does not +exist (e.g., on s390x). .TP \fB-\-zipl\fR diff --git a/grubby.spec b/grubby.spec index bc8af22..3c46a08 100644 --- a/grubby.spec +++ b/grubby.spec @@ -1,6 +1,6 @@ Name: grubby Version: 8.40 -Release: 57%{?dist} +Release: 58%{?dist} Summary: Command line tool for updating bootloader configs License: GPLv2+ URL: https://github.com/rhinstaller/grubby @@ -128,9 +128,13 @@ current boot environment. %attr(0755,root,root) %{_sbindir}/grubby %attr(0755,root,root) %{_sbindir}/installkernel %attr(0755,root,root) %{_sbindir}/new-kernel-pkg - %{_mandir}/man8/*.8* +%{_mandir}/man8/*.8* %changelog +* Tue Jul 19 2022 Robbie Harwood - 8.40-58 +- Clarify that grub files aren't used on s390x in man page +- Resolves: #2105118 + * Wed Jun 22 2022 Robbie Harwood - 8.40-57 - Revert previous change (fedora sync) - Resolves: #1969362