|
 |
23d2ea |
From b1c4268fc7b10a8febe2800256b6a6cbc1caf437 Mon Sep 17 00:00:00 2001
|
|
|
39700a |
From: Peter Jones <pjones@redhat.com>
|
|
|
39700a |
Date: Tue, 23 Sep 2014 09:58:49 -0400
|
|
|
27a4da |
Subject: [PATCH 153/260] Fix up some man pages rpmdiff noticed.
|
|
|
39700a |
|
|
|
39700a |
---
|
|
|
39700a |
configure.ac | 2 ++
|
|
|
39700a |
util/grub-macbless.8 | 26 +++++++++++++++++++
|
|
|
39700a |
util/grub-mkimage.1 | 2 +-
|
|
|
39700a |
util/grub-syslinux2cfg.1 | 65 ++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
39700a |
4 files changed, 94 insertions(+), 1 deletion(-)
|
|
|
39700a |
create mode 100644 util/grub-macbless.8
|
|
|
39700a |
create mode 100644 util/grub-syslinux2cfg.1
|
|
|
39700a |
|
|
|
39700a |
diff --git a/configure.ac b/configure.ac
|
|
|
27a4da |
index 53fd7c73e..048ce7c89 100644
|
|
|
39700a |
--- a/configure.ac
|
|
|
39700a |
+++ b/configure.ac
|
|
|
39700a |
@@ -76,6 +76,7 @@ grub_TRANSFORM([grub-fstest.3])
|
|
|
39700a |
grub_TRANSFORM([grub-glue-efi.3])
|
|
|
39700a |
grub_TRANSFORM([grub-install.1])
|
|
|
39700a |
grub_TRANSFORM([grub-kbdcomp.3])
|
|
|
39700a |
+grub_TRANSFORM([grub-macbless.8])
|
|
|
39700a |
grub_TRANSFORM([grub-menulst2cfg.1])
|
|
|
39700a |
grub_TRANSFORM([grub-mkconfig.1])
|
|
|
39700a |
grub_TRANSFORM([grub-mkfont.3])
|
|
|
39700a |
@@ -93,6 +94,7 @@ grub_TRANSFORM([grub-render-label.3])
|
|
|
39700a |
grub_TRANSFORM([grub-script-check.3])
|
|
|
39700a |
grub_TRANSFORM([grub-set-default.1])
|
|
|
39700a |
grub_TRANSFORM([grub-sparc64-setup.3])
|
|
|
39700a |
+grub_TRANSFORM([grub-syslinux2cfg.1])
|
|
|
39700a |
|
|
|
39700a |
# Optimization flag. Allow user to override.
|
|
|
39700a |
if test "x$TARGET_CFLAGS" = x; then
|
|
|
39700a |
diff --git a/util/grub-macbless.8 b/util/grub-macbless.8
|
|
|
39700a |
new file mode 100644
|
|
|
27a4da |
index 000000000..ae842f3a6
|
|
|
39700a |
--- /dev/null
|
|
|
39700a |
+++ b/util/grub-macbless.8
|
|
|
39700a |
@@ -0,0 +1,26 @@
|
|
|
39700a |
+.TH GRUB-MACBLESS 1 "Wed Feb 26 2014"
|
|
|
39700a |
+.SH NAME
|
|
|
39700a |
+\fBgrub-macbless\fR \(em Mac-style bless utility for HFS or HFS+
|
|
|
39700a |
+
|
|
|
39700a |
+.SH SYNOPSIS
|
|
|
39700a |
+\fBgrub-macbless\fR [-p | --ppc] [-v | --verbose] [-x | --x86] \fIFILE\fR
|
|
|
39700a |
+
|
|
|
39700a |
+.SH DESCRIPTION
|
|
|
39700a |
+\fBgrub-mkimage\fR blesses a file on an HFS or HFS+ file system, so that it
|
|
|
39700a |
+can be used to boot a Mac.
|
|
|
39700a |
+
|
|
|
39700a |
+.SH OPTIONS
|
|
|
39700a |
+.TP
|
|
|
39700a |
+--ppc
|
|
|
39700a |
+Bless the file for use on PPC-based Macs.
|
|
|
39700a |
+
|
|
|
39700a |
+.TP
|
|
|
39700a |
+--verbose
|
|
|
39700a |
+Print verbose messages.
|
|
|
39700a |
+
|
|
|
39700a |
+.TP
|
|
|
39700a |
+--x86
|
|
|
39700a |
+Bless the file for use on x86-based Macs.
|
|
|
39700a |
+
|
|
|
39700a |
+.SH SEE ALSO
|
|
|
39700a |
+.BR "info grub"
|
|
|
39700a |
diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1
|
|
|
27a4da |
index 4dea4f545..0eaaafe50 100644
|
|
|
39700a |
--- a/util/grub-mkimage.1
|
|
|
39700a |
+++ b/util/grub-mkimage.1
|
|
|
39700a |
@@ -17,7 +17,7 @@
|
|
|
39700a |
[-v | --verbose] \fIMODULES\fR
|
|
|
39700a |
|
|
|
39700a |
.SH DESCRIPTION
|
|
|
39700a |
-\fBgrub-mkimage\fI builds a bootable image of GRUB.
|
|
|
39700a |
+\fBgrub-mkimage\fR builds a bootable image of GRUB.
|
|
|
39700a |
|
|
|
39700a |
.SH OPTIONS
|
|
|
39700a |
.TP
|
|
|
39700a |
diff --git a/util/grub-syslinux2cfg.1 b/util/grub-syslinux2cfg.1
|
|
|
39700a |
new file mode 100644
|
|
|
27a4da |
index 000000000..853094827
|
|
|
39700a |
--- /dev/null
|
|
|
39700a |
+++ b/util/grub-syslinux2cfg.1
|
|
|
39700a |
@@ -0,0 +1,65 @@
|
|
|
39700a |
+.TH GRUB-SYSLINUX2CFG 1 "Wed Feb 26 2014"
|
|
|
39700a |
+.SH NAME
|
|
|
39700a |
+\fBgrub-syslinux2cfg\fR \(em Transform a syslinux config file into a GRUB config.
|
|
|
39700a |
+
|
|
|
39700a |
+.SH SYNOPSIS
|
|
|
39700a |
+\fBgrub-syslinux2cfg\fR [-c | --cwd=\fRDIR\fI] [-r | --root=\fIDIR\fR] [-v | --verbose]
|
|
|
39700a |
+.RE
|
|
|
39700a |
+.RS 25
|
|
|
39700a |
+[-t | --target-root=\fIDIR\fR] [-T | --target-cwd=\fIDIR\fR]
|
|
|
39700a |
+.RE
|
|
|
39700a |
+.RS 25
|
|
|
39700a |
+[-o | --output=\fIFILE\fR] [[-i | --isolinux] |
|
|
|
39700a |
+.RE
|
|
|
39700a |
+.RS 46
|
|
|
39700a |
+ [-s | --syslinux] |
|
|
|
39700a |
+.RE
|
|
|
39700a |
+.RS 46
|
|
|
39700a |
+ [-p | --pxelinux]] \fIFILE\fR
|
|
|
39700a |
+
|
|
|
39700a |
+.SH DESCRIPTION
|
|
|
39700a |
+\fBgrub-syslinux2cfg\fR builds a GRUB configuration file out of an existing
|
|
|
39700a |
+syslinux configuration file.
|
|
|
39700a |
+
|
|
|
39700a |
+.SH OPTIONS
|
|
|
39700a |
+.TP
|
|
|
39700a |
+--cwd=\fIDIR\fR
|
|
|
39700a |
+Set \fIDIR\fR as syslinux's working directory. The default is to use the
|
|
|
39700a |
+parent directory of the input file.
|
|
|
39700a |
+
|
|
|
39700a |
+.TP
|
|
|
39700a |
+--root=\fIDIR\fR
|
|
|
39700a |
+Set \fIDIR\fR as the root directory of the syslinux disk. The default value
|
|
|
39700a |
+is "/".
|
|
|
39700a |
+
|
|
|
39700a |
+.TP
|
|
|
39700a |
+--verbose
|
|
|
39700a |
+Print verbose messages.
|
|
|
39700a |
+
|
|
|
39700a |
+.TP
|
|
|
39700a |
+--target-root=\fIDIR\fR
|
|
|
39700a |
+Root directory as it will be seen at runtime. The default value is "/".
|
|
|
39700a |
+
|
|
|
39700a |
+.TP
|
|
|
39700a |
+--target-cwd=\fIDIR\fR
|
|
|
39700a |
+Working directory of syslinux as it will be seen at runtime. The default
|
|
|
39700a |
+value is the parent directory of the input file.
|
|
|
39700a |
+
|
|
|
39700a |
+.TP
|
|
|
39700a |
+--output=\fIFILE\fR
|
|
|
39700a |
+Write the new config file to \fIFILE\fR. The default value is standard output.
|
|
|
39700a |
+
|
|
|
39700a |
+.TP
|
|
|
39700a |
+--isolinux
|
|
|
39700a |
+Assume that the input file is an isolinux configuration file.
|
|
|
39700a |
+
|
|
|
39700a |
+.TP
|
|
|
39700a |
+--pxelinux
|
|
|
39700a |
+Assume that the input file is a pxelinux configuration file.
|
|
|
39700a |
+
|
|
|
39700a |
+.TP
|
|
|
39700a |
+--syslinux
|
|
|
39700a |
+Assume that the input file is a syslinux configuration file.
|
|
|
39700a |
+
|
|
|
39700a |
+.SH SEE ALSO
|
|
|
39700a |
+.BR "info grub"
|
|
|
39700a |
--
|
|
|
27a4da |
2.13.0
|
|
|
39700a |
|