From 6cbaf3d3aa8d4c9952636b121a2c3e1ec67a455e Mon Sep 17 00:00:00 2001 From: yueyuankun Date: Thu, 19 Sep 2024 16:21:43 +0800 Subject: [PATCH] =?UTF-8?q?After=20opening=20the=20manual=20through=20man,?= =?UTF-8?q?=20the=20symbol=20-=20cannot=20be=20recognized.=20Escaping=20th?= =?UTF-8?q?e=20symbol=20=E2=80=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 289982d80685e518ed1c506883faa11e1798295c) --- ...e-manual-through-man-the-symbol-cann.patch | 473 ++++++++++++++++++ grubby.spec | 6 +- 2 files changed, 478 insertions(+), 1 deletion(-) create mode 100644 grubby-8.40-After-opening-the-manual-through-man-the-symbol-cann.patch diff --git a/grubby-8.40-After-opening-the-manual-through-man-the-symbol-cann.patch b/grubby-8.40-After-opening-the-manual-through-man-the-symbol-cann.patch new file mode 100644 index 0000000..9fba980 --- /dev/null +++ b/grubby-8.40-After-opening-the-manual-through-man-the-symbol-cann.patch @@ -0,0 +1,473 @@ +From 6faa135e298a4a11dd5dac6e0093270abe2436d8 Mon Sep 17 00:00:00 2001 +From: yueyuankunr +Date: Thu, 19 Sep 2024 16:08:59 +0800 +Subject: [PATCH] After opening the manual through man, the symbol - cannot be + recognized. Escaping the symbol ‐ + +--- + grubby.8 | 134 +++++++++++++++++++++++------------------------ + installkernel.8 | 6 +-- + new-kernel-pkg.8 | 66 +++++++++++------------ + 3 files changed, 103 insertions(+), 103 deletions(-) + +diff --git a/grubby.8 b/grubby.8 +index 355b6eb..c7fc7e6 100644 +--- a/grubby.8 ++++ b/grubby.8 +@@ -3,19 +3,19 @@ + grubby \- command line tool for configuring grub, lilo, elilo, yaboot and zipl + + .SH SYNOPSIS +-\fBgrubby\fR [--add-kernel=\fIkernel-path\fR] [--args=\fIargs\fR] +- [--bad-image-okay] [--boot-filesystem=\fIbootfs\fR] +- [--bootloader-probe] [--config-file \fIpath\fR] [--copy-default] +- [--debug] [--default-kernel] [--default-index] [--default-title] +- [--devtree=\fIdevicetree.dtb\fR] +- [--grub] [--lilo] [--yaboot] [--silo] [--zipl] +- [--info=\fIkernel-path\fR] [--initrd=\fIinitrd-path\fR] +- [--make-default] [-o path] [--version] +- [--remove-kernel=\fIkernel-path\fR] [--remove-args=\fIargs\fR] +- [--set-default=\fIkernel-path\fR] [--set-default-index=\fientry-index\fR] +- [--title=entry-title] [--add-multiboot=\fImultiboot-path\fR] +- [--mbargs=\fIargs\fR] [--remove-multiboot=\fImultiboot-path\fR] +- [--remove-mbargs=\fIargs\fR] ++\fBgrubby\fR [\-\-add\-kernel=\fIkernel\-path\fR] [\-\-args=\fIargs\fR] ++ [\-\-bad\-image\-okay] [\-\-boot\-filesystem=\fIbootfs\fR] ++ [\-\-bootloader\-probe] [\-\-config\-file \fIpath\fR] [\-\-copy\-default] ++ [\-\-debug] [\-\-default\-kernel] [\-\-default\-index] [\-\-default\-title] ++ [\-\-devtree=\fIdevicetree.dtb\fR] ++ [\-\-grub] [\-\-lilo] [\-\-yaboot] [\-\-silo] [\-\-zipl] ++ [\-\-info=\fIkernel\-path\fR] [\-\-initrd=\fIinitrd\-path\fR] ++ [\-\-make\-default] [\-o path] [\-\-version] ++ [\-\-remove\-kernel=\fIkernel\-path\fR] [\-\-remove\-args=\fIargs\fR] ++ [\-\-set\-default=\fIkernel\-path\fR] [\-\-set\-default\-index=\fientry\-index\fR] ++ [\-\-title=entry\-title] [\-\-add\-multiboot=\fImultiboot\-path\fR] ++ [\-\-mbargs=\fIargs\fR] [\-\-remove\-multiboot=\fImultiboot\-path\fR] ++ [\-\-remove\-mbargs=\fIargs\fR] + + .SH DESCRIPTION + \fBgrubby\fR is a command line tool for updating and displaying information +@@ -24,8 +24,8 @@ about the configuration files for the \fBgrub\fR, \fBlilo\fR, \fBelilo\fR + is primarily designed to be used from scripts which install new + kernels and need to find information about the current boot environment. + +-On BIOS-based Intel x86 platforms, \fBgrub2\fR is the default bootloader and +-the configuration file is in \fB/boot/grub2/grub.cfg\fR. On UEFI-based Intel ++On BIOS\-based Intel x86 platforms, \fBgrub2\fR is the default bootloader and ++the configuration file is in \fB/boot/grub2/grub.cfg\fR. On UEFI\-based Intel + x86 platforms, \fBgrub2\fR is the default bootloader, and the configuration + file is in \fB/boot/efi/EFI/redhat/grub.cfg\fR. On Intel ia64 platforms, + \fBelilo\fR mode is used and the default location for the configuration file +@@ -35,8 +35,8 @@ config stored in \fB/boot/grub2/grub.cfg\fR. The earlier Power7 systems use \fBy + parsing and the configuration file should be in \fB/etc/yaboot.conf\fR. On + s390 platforms the \fBzipl bootloader\fR will read from \fB/etc/zipl.conf\fR. + +-There are a number of ways to specify the kernel used for \fB-\-info\fR, +-\fB-\-remove-kernel\fR, and \fB-\-update-kernel\fR. Specificying \fBDEFAULT\fR ++There are a number of ways to specify the kernel used for \fB\-\-info\fR, ++\fB\-\-remove\-kernel\fR, and \fB\-\-update\-kernel\fR. Specificying \fBDEFAULT\fR + or \fBALL\fR selects the default entry and all of the entries, respectively. + If a comma separated list of numbers is given, the boot entries indexed + by those numbers are selected. Finally, the title of a boot entry may +@@ -45,15 +45,15 @@ with that title are used. + + .SH OPTIONS + .TP +-\fB-\-add-kernel\fR=\fIkernel-path\fR +-Add a new boot entry for the kernel located at \fIkernel-path\fR. ++\fB\-\-add\-kernel\fR=\fIkernel\-path\fR ++Add a new boot entry for the kernel located at \fIkernel\-path\fR. + + .TP +-\fB-\-args\fR=\fIkernel-args\fR ++\fB\-\-args\fR=\fIkernel\-args\fR + When a new kernel is added, this specifies the command line arguments + which should be passed to the kernel by default (note they are merged +-with the arguments from the template if \fB-\-copy-default\fR is used). +-When \fB-\-update-kernel\fR is used, this specifies new arguments to add ++with the arguments from the template if \fB\-\-copy\-default\fR is used). ++When \fB\-\-update\-kernel\fR is used, this specifies new arguments to add + to the argument list. Multiple, space separated arguments may be used. If + an argument already exists the new value replaces the old values. The + \fBroot=\fR kernel argument gets special handling if the configuration +@@ -61,7 +61,7 @@ file has special handling for specifying the root filesystem (like + lilo.conf does). + + .TP +-\fB-\-bad-image-okay\fR ++\fB\-\-bad\-image\-okay\fR + When \fBgrubby\fR is looking for a entry to use for something (such + as a template or a default boot entry) it uses sanity checks, such as + ensuring that the kernel exists in the filesystem, to make sure +@@ -69,7 +69,7 @@ entries that obviously won't work aren't selected. This option overrides + that behavior, and is designed primarily for testing. + + .TP +-\fB-\-boot-filesystem\fR=\fIbootfs\fR ++\fB\-\-boot\-filesystem\fR=\fIbootfs\fR + The \fBgrub\fR boot loader expects file paths listed in it's configuration + path to be relative to the top of the filesystem they are on, rather then + relative to the current root filesystem. By default \fBgrubby\fR searches +@@ -78,7 +78,7 @@ is given \fBgrubby\fR acts as if the specified filesystem was the filesystem + containing the kernel (this option is designed primarily for testing). + + .TP +-\fB-\-bootloader-probe\fR ++\fB\-\-bootloader\-probe\fR + \fBgrubby\fR tries to determine if \fBgrub\fR or \fBlilo\fR is currently + installed. When one of those bootloaders is found the name of that bootloader + is displayed on stdout. Both could be installed (on different devices), and +@@ -91,107 +91,107 @@ This option is only available on ia32 platforms. + + + .TP +-\fB-\-config-file\fR=\fIpath\fR ++\fB\-\-config\-file\fR=\fIpath\fR + Use \fIpath\fR as the configuration file rather then the default. + + .TP +-\fB-\-copy-default\fR ++\fB\-\-copy\-default\fR + \fBgrubby\fR will copy as much information (such as kernel arguments and + root device) as possible from the current default kernel. The kernel path + and initrd path will never be copied. + + .TP +-\fB-\-debug\fR ++\fB\-\-debug\fR + Display extra debugging information for failures. + + .TP +-\fB-\-default-kernel\fR ++\fB\-\-default\-kernel\fR + Display the full path to the current default kernel and exit. + + .TP +-\fB-\-default-index\fR ++\fB\-\-default\-index\fR + Display the numeric index of the current default boot entry and exit. + + .TP +-\fB-\-default-title\fR ++\fB\-\-default\-title\fR + Display the title of the current default boot entry and exit. + + .TP +-\fB-\-devtree\fR=\fIpath\fR ++\fB\-\-devtree\fR=\fIpath\fR + Use \fIpath\fR for device tree path in place of the path of any devicetree + directive found in the template stanza. + + .TP +-\fB-\-elilo\fR ++\fB\-\-elilo\fR + Use an \fBelilo\fR style configuration file. + + .TP +-\fB-\-grub\fR ++\fB\-\-grub\fR + Use a \fBgrub\fR style configuration file instead of \fBlilo\fR style. This + 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 ++\fB\-\-info\fR=\fIkernel\-path\fR ++Display information on all boot entries which match \fIkernel\-path\fR. I + + .TP +-\fB-\-initrd\fR=\fIinitrd-path\fR +-Use \fIinitrd-path\fR as the path to an initial ram disk for a new kernel ++\fB\-\-initrd\fR=\fIinitrd\-path\fR ++Use \fIinitrd\-path\fR as the path to an initial ram disk for a new kernel + being added. + + .TP +-\fB-\-lilo\fR ++\fB\-\-lilo\fR + Use a \fBlilo\fR style configuration file. + + .TP +-\fB-\-make-default\fR ++\fB\-\-make\-default\fR + Make the new kernel entry being added the default entry. + + .TP +-\fB-\-remove-args\fR=\fIkernel-args\fR +-The arguments specified by \fIkernel-args\fR are removed from the +-kernels specified by \fB-\-update-kernel\fR. The \fBroot\fR argument ++\fB\-\-remove\-args\fR=\fIkernel\-args\fR ++The arguments specified by \fIkernel\-args\fR are removed from the ++kernels specified by \fB\-\-update\-kernel\fR. The \fBroot\fR argument + gets special handling for configuration files that support separate root + filesystem configuration. + + .TP +-\fB-\-remove-kernel\fR=\fIkernel-path\fR +-Removes all boot entries which match \fIkernel-path\fR. This may be used +-along with -\-add-kernel, in which case the new kernel being added will ++\fB\-\-remove\-kernel\fR=\fIkernel\-path\fR ++Removes all boot entries which match \fIkernel\-path\fR. This may be used ++along with \-\-add\-kernel, in which case the new kernel being added will + never be removed. + + .TP +-\fB-\-set-default\fR=\fIkernel-path\fR ++\fB\-\-set\-default\fR=\fIkernel\-path\fR + The first entry which boots the specified kernel is made the default + boot entry. + + .TP +-\fB-\-set-default-index\fR=\fIentry-index\fR ++\fB\-\-set\-default\-index\fR=\fIentry\-index\fR + Makes the given entry number the default boot entry. + + .TP +-\fB-\-title\fR=\fIentry-title\fR +-When a new kernel entry is added \fIentry-title\fR is used as the title +-(\fBlilo\fR label) for the entry. If \fIentry-title\fR is longer then maximum ++\fB\-\-title\fR=\fIentry\-title\fR ++When a new kernel entry is added \fIentry\-title\fR is used as the title ++(\fBlilo\fR label) for the entry. If \fIentry\-title\fR is longer then maximum + length allowed by the bootloader (15 for lilo, unlimited for grub and elilo) + the title is shortened to a (unique) entry. + + .TP +-\fB-\-update-kernel\fR=\fIkernel-path\fR +-The entries for kernels matching \fRkernel-path\fR are updated. Currently ++\fB\-\-update\-kernel\fR=\fIkernel\-path\fR ++The entries for kernels matching \fRkernel\-path\fR are updated. Currently + 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. ++modified via the \fB\-\-args\fR and \fB\-\-remove\-args\fR options. + + .TP +-\fB-\-version\fR ++\fB\-\-version\fR + Display the version of \fBgrubby\fR being run and then exit immediately. + + .TP +-\fB-\-yaboot\fR ++\fB\-\-yaboot\fR + Use an \fByaboot\fR style configuration file. + + .TP +-\fB-\-zipl\fR ++\fB\-\-zipl\fR + Use an \fBzipl\fR style configuration file. + + .SH MULTIBOOT OPTIONS +@@ -199,27 +199,27 @@ The Multiboot Specification provides a genreic interface for boot + loaders and operating systems. It is supported by the GRUB bootloader. + + .TP +-\fB-\-add-multiboot\fR=\fImultiboot-path\fR ++\fB\-\-add\-multiboot\fR=\fImultiboot\-path\fR + Add a new boot entry for the multiboot kernel located at +-\fImultiboot-path\fR. Note that this is generally accompanied with a +-\fI--add-kernel\fR option. ++\fImultiboot\-path\fR. Note that this is generally accompanied with a ++\fI\-\-add\-kernel\fR option. + + .TP +-\fB-\-remove-multiboot\fR=\fImultiboot-path\fR +-Removes all boot entries which match \fImultiboot-path\fR. ++\fB\-\-remove\-multiboot\fR=\fImultiboot\-path\fR ++Removes all boot entries which match \fImultiboot\-path\fR. + + .TP +-\fB-\-mbargs\fR=\fImultiboot-args\fR ++\fB\-\-mbargs\fR=\fImultiboot\-args\fR + When a new multiboot kernel is added, this specifies the command line + arguments which should be passed to that kernel by default +-When \fB-\-update-kernel\fR is used, this specifies new arguments to add ++When \fB\-\-update\-kernel\fR is used, this specifies new arguments to add + to the argument list. Multiple, space separated arguments may be used. If + an argument already exists the new value replaces the old values. + + .TP +-\fB-\-remove-mbargs\fR=\fImultiboot-args\fR +-The arguments specified by \fImultiboot-args\fR are removed from the +-kernels specified by \fB-\-update-kernel\fR. ++\fB\-\-remove\-mbargs\fR=\fImultiboot\-args\fR ++The arguments specified by \fImultiboot\-args\fR are removed from the ++kernels specified by \fB\-\-update\-kernel\fR. + + + .SH "BUGS" +diff --git a/installkernel.8 b/installkernel.8 +index e06b802..5a1715f 100644 +--- a/installkernel.8 ++++ b/installkernel.8 +@@ -3,21 +3,21 @@ + installkernel \- tool to script kernel installation + + .SH SYNOPSIS +-\fBinstallkernel\fR \fI \fR ++\fBinstallkernel\fR \fI \fR + + .SH DESCRIPTION + \fBinstallkernel\fR installs a new kernel image onto the system from + the Linux source tree. It is called by the Linux kernel makefiles when + \fBmake install\fR is invoked there. + +-The new kernel is installed into {directory}/vmlinuz-{version}. If a ++The new kernel is installed into {directory}/vmlinuz\-{version}. If a + symbolic link {directory}/vmlinuz already exists, it is refreshed by + making a link from {directory}/vmlinuz to the new kernel, and the + previously installed kernel is available as {directory}/vmlinuz.old. + + .SH "SEE ALSO" + .BR grubby(8) +-.BR new-kernel-pkg(8) ++.BR new\-kernel\-pkg(8) + + .SH AUTHORS + .nf +diff --git a/new-kernel-pkg.8 b/new-kernel-pkg.8 +index 9868202..e226961 100644 +--- a/new-kernel-pkg.8 ++++ b/new-kernel-pkg.8 +@@ -1,106 +1,106 @@ +-.TH NEW-KERNEL-PKG 8 "Wed Apr 14 2010" ++.TH NEW\-KERNEL\-PKG 8 "Wed Apr 14 2010" + .SH NAME +-new-kernel-pkg \- tool to script kernel installation ++new\-kernel\-pkg \- tool to script kernel installation + + .SH SYNOPSIS +-\fBnew-kernel-pkg\fR [-v] [--mkinitrd] [--rminitrd] [--dracut] +- [--initrdfile=\fIinitrd-image\fR] [--depmod] [--rmmoddep] +- [--kernel-args=\fIargs\fR] [--remove-args=\fIargs\fR] +- [--banner=\fIbanner\fR] [--multiboot=\fImultiboot\fR] +- [--mbargs=\fImbargs\fR] [--make-default] [--add-dracut-args] +- [--add-plymouth-initrd] [--host-only] [--devtree=\fIdevicetree.dtb\fR] +- <--install | --remove | --update | --rpmposttrans> ++\fBnew\-kernel\-pkg\fR [\-v] [\-\-mkinitrd] [\-\-rminitrd] [\-\-dracut] ++ [\-\-initrdfile=\fIinitrd\-image\fR] [\-\-depmod] [\-\-rmmoddep] ++ [\-\-kernel\-args=\fIargs\fR] [\-\-remove\-args=\fIargs\fR] ++ [\-\-banner=\fIbanner\fR] [\-\-multiboot=\fImultiboot\fR] ++ [\-\-mbargs=\fImbargs\fR] [\-\-make\-default] [\-\-add\-dracut\-args] ++ [\-\-add\-plymouth\-initrd] [\-\-host\-only] [\-\-devtree=\fIdevicetree.dtb\fR] ++ <\-\-install | \-\-remove | \-\-update | \-\-rpmposttrans> + + .SH DESCRIPTION +-\fBnew-kernel-pkg\fR is a tool used in packaging to automate the installation ++\fBnew\-kernel\-pkg\fR is a tool used in packaging to automate the installation + of a new kernel, including the creation of an initial ram filesystem image, + updating of bootloader configuration, and other associated tasks. + + .SH OPTIONS + .TP +-\fB-v\fR ++\fB\-v\fR + Be verbose. + + .TP +-\fB-\-mkinitrd\fR ++\fB\-\-mkinitrd\fR + Create a new initial ram filesystem image. + + .TP +-\fB-\-rminitrd\fR ++\fB\-\-rminitrd\fR + Remove an initial ram filesystem image. + + .TP +-\fB-\-devtree\fR=\fIdevicetree.dtb\fR ++\fB\-\-devtree\fR=\fIdevicetree.dtb\fR + Use \fIdevicetree.dtb\fR as the device tree file in place of any devicetree + directive from the template stanza. + + .TP +-\fB-\-dracut\fR ++\fB\-\-dracut\fR + When creating a new initial ram filesystem image, use dracut(8) rather +-than mkinitrd(8). Used in conjunction with -\-mkinitrd . ++than mkinitrd(8). Used in conjunction with \-\-mkinitrd . + + .TP +-\fB-\-initrdfile\fR=\fIinitrd-image\fR ++\fB\-\-initrdfile\fR=\fIinitrd\-image\fR + Use the specified file as the initial ram filesystem image. + + .TP +-\fB-\-depmod\fR ++\fB\-\-depmod\fR + Create modules.dep and related files. + + .TP +-\fB-\-rmmoddep\fR ++\fB\-\-rmmoddep\fR + Remove modules.dep and related files. + + .TP +-\fB-\-kernel-args\fR=\fIargs\fR ++\fB\-\-kernel\-args\fR=\fIargs\fR + Use \fIargs\fR as the boot command line for this kernel. + + .TP +-\fB-\-remove-args\fR=\fIargs\fR ++\fB\-\-remove\-args\fR=\fIargs\fR + Remove specified kernel arguments for this kernel. + + .TP +-\fB-\-banner\fR=\fIbanner\fR ++\fB\-\-banner\fR=\fIbanner\fR + Display \fIbanner\fR as the banner text in the bootloader. + + .TP +-\fB-\-multiboot\fR=\fImultiboot-image\fR +-Use \fImultiboot-image\fR as a multiboot image. ++\fB\-\-multiboot\fR=\fImultiboot\-image\fR ++Use \fImultiboot\-image\fR as a multiboot image. + + .TP +-\fB-\-mbargs\fR=\fImbargs\fR ++\fB\-\-mbargs\fR=\fImbargs\fR + Use \fImbargs\fR as arguments to the multiboot image. + + .TP +-\fB-\-make-default\fR ++\fB\-\-make\-default\fR + Make this kernel the default boot option. + + .TP +-\fB-\-add-dracut-args\fR ++\fB\-\-add\-dracut\-args\fR + Automatically generate dracut options and add them to the kernel command line. + + .TP +-\fB-\-add-plymouth-initrd\fR ++\fB\-\-add\-plymouth\-initrd\fR + Automatically add plymouth to the initial ram filesystem image. + + .TP +-\fB-\-host-only\fR ++\fB\-\-host\-only\fR + Make an initial ram filesystem image that is specific to the running system. + + .TP +-\fB-\-install\fR \fIkernel-version\fR ++\fB\-\-install\fR \fIkernel\-version\fR + Install a new kernel. + + .TP +-\fB-\-remove\fR \fIkernel-version\fR ++\fB\-\-remove\fR \fIkernel\-version\fR + Remove an installed kernel. + + .TP +-\fB-\-update\fR \fIkernel-version\fR ++\fB\-\-update\fR \fIkernel\-version\fR + Update the specified kernel. + + .TP +-\fB-\-rpmposttrans\fR \fIkernel-version\fR ++\fB\-\-rpmposttrans\fR \fIkernel\-version\fR + Run the rpmposttrans for the specified kernel. + + .SH "SEE ALSO" +-- +2.43.0 + diff --git a/grubby.spec b/grubby.spec index 63ca13d..a587829 100644 --- a/grubby.spec +++ b/grubby.spec @@ -1,6 +1,6 @@ Name: grubby Version: 8.40 -Release: 33 +Release: 34 Summary: Update and display information about the configuration files License: GPLv2+ URL: https://github.com/rhinstaller/grubby @@ -38,6 +38,7 @@ Patch9002: 0001-add-loongarch-support-for-grubby.patch Patch9003: grubby-aarch64-skip-test-grub2.15.patch Patch9004: support-specify-cc.patch Patch9005: 0001-add-riscv64-support.patch +Patch9006: grubby-8.40-After-opening-the-manual-through-man-the-symbol-cann.patch BuildRequires: gcc pkgconfig glib2-devel popt-devel BuildRequires: libblkid-devel git-core sed make @@ -116,6 +117,9 @@ sed -e "s,@@LIBEXECDIR@@,%{_libexecdir}/installkernel,g" %{SOURCE3} > %{buildroo %{_mandir}/man8/*.8* %changelog +* Thu Sep 19 2024 yueyuankun - 8.40-34 +- Fix man manual unable to recognize '-' + * Fri May 10 2024 ouuleilei - 8.40-33 - add riscv64 support