Another set of mostly grubby-bls fixes
- grubby-bls: also print the absolute path in the --default-kernel option Resolves: rhbz#1649778 - grubby-bls: allow to specify the same kernel param multiple times Resolves: rhbz#1652486 - grubby-bls: expand kernel options if these are environment variables Resolves: rhbz#1649785 - grubby-bls: always generate the BLS snippets when adding new entries Resolves: rhbz#1653365 - Improve man page for --info option (jstodola) Resolves: rhbz#1651672 - Make the old grubby take precedence over grubby-bls if is installed Related: rhbz#165484 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
This commit is contained in:
parent
27cf1e7399
commit
2ad4f485f1
30
0009-Improve-man-page-for-info-option.patch
Normal file
30
0009-Improve-man-page-for-info-option.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
From 64f91f29b03639b0726f0c46f004a20f11379e22 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jan Stodola <jstodola@redhat.com>
|
||||||
|
Date: Sat, 1 Dec 2018 02:33:23 +0100
|
||||||
|
Subject: [PATCH] Improve man page for --info option
|
||||||
|
|
||||||
|
1) commit 941d4a0b removed description of --info DEFAULT
|
||||||
|
2) Add description of --info ALL
|
||||||
|
---
|
||||||
|
grubby.8 | 5 ++++-
|
||||||
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/grubby.8 b/grubby.8
|
||||||
|
index 355b6eb6908..9ffef895b0f 100644
|
||||||
|
--- a/grubby.8
|
||||||
|
+++ b/grubby.8
|
||||||
|
@@ -132,7 +132,10 @@ is the default on ia32 platforms.
|
||||||
|
|
||||||
|
.TP
|
||||||
|
\fB-\-info\fR=\fIkernel-path\fR
|
||||||
|
-Display information on all boot entries which match \fIkernel-path\fR. I
|
||||||
|
+Display information on all boot entries which match \fIkernel-path\fR. If
|
||||||
|
+\fIkernel-path\fR is \fBDEFAULT\fR, then information on the default kernel
|
||||||
|
+is displayed. If \fIkernel-path\fR is \fBALL\fR, then information on all boot
|
||||||
|
+entries are displayed.
|
||||||
|
|
||||||
|
.TP
|
||||||
|
\fB-\-initrd\fR=\fIinitrd-path\fR
|
||||||
|
--
|
||||||
|
2.19.1
|
||||||
|
|
17
grubby.spec
17
grubby.spec
@ -1,6 +1,6 @@
|
|||||||
Name: grubby
|
Name: grubby
|
||||||
Version: 8.40
|
Version: 8.40
|
||||||
Release: 21%{?dist}
|
Release: 22%{?dist}
|
||||||
Summary: Command line tool for updating bootloader configs
|
Summary: Command line tool for updating bootloader configs
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://github.com/rhinstaller/grubby
|
URL: https://github.com/rhinstaller/grubby
|
||||||
@ -21,6 +21,7 @@ Patch0005: 0005-Use-system-LDFLAGS.patch
|
|||||||
Patch0006: 0006-Honor-sbindir.patch
|
Patch0006: 0006-Honor-sbindir.patch
|
||||||
Patch0007: 0007-Make-installkernel-to-use-kernel-install-scripts-on-.patch
|
Patch0007: 0007-Make-installkernel-to-use-kernel-install-scripts-on-.patch
|
||||||
Patch0008: 0008-Add-usr-libexec-rpm-sort.patch
|
Patch0008: 0008-Add-usr-libexec-rpm-sort.patch
|
||||||
|
Patch0009: 0009-Improve-man-page-for-info-option.patch
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: pkgconfig glib2-devel popt-devel
|
BuildRequires: pkgconfig glib2-devel popt-devel
|
||||||
@ -129,6 +130,20 @@ current boot environment.
|
|||||||
%{_mandir}/man8/*.8*
|
%{_mandir}/man8/*.8*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Nov 30 2018 Javier Martinez Canillas <javierm@redhat.com> - 8.40-22
|
||||||
|
- grubby-bls: also print the absolute path in the --default-kernel option
|
||||||
|
Resolves: rhbz#1649778
|
||||||
|
- grubby-bls: allow to specify the same kernel param multiple times
|
||||||
|
Resolves: rhbz#1652486
|
||||||
|
- grubby-bls: expand kernel options if these are environment variables
|
||||||
|
Resolves: rhbz#1649785
|
||||||
|
- grubby-bls: always generate the BLS snippets when adding new entries
|
||||||
|
Resolves: rhbz#1653365
|
||||||
|
- Improve man page for --info option (jstodola)
|
||||||
|
Resolves: rhbz#1651672
|
||||||
|
- Make the old grubby take precedence over grubby-bls if is installed
|
||||||
|
Related: rhbz#165484
|
||||||
|
|
||||||
* Wed Nov 21 2018 Javier Martinez Canillas <javierm@redhat.com> - 8.40-21
|
* Wed Nov 21 2018 Javier Martinez Canillas <javierm@redhat.com> - 8.40-21
|
||||||
- installkernel-bls: remove unnecessary check for GRUB_ENABLE_BLSCFG=true
|
- installkernel-bls: remove unnecessary check for GRUB_ENABLE_BLSCFG=true
|
||||||
Resolves: rhbz#1647721
|
Resolves: rhbz#1647721
|
||||||
|
Loading…
Reference in New Issue
Block a user