From 778ab7d0c404022717de07bd9e67ca8573906dc1 Mon Sep 17 00:00:00 2001 From: WANG Chao Date: Tue, 7 Jan 2014 14:49:04 +0800 Subject: [PATCH] makedumpfile: Add help and man message for '--help' This is a backport of the following upstream commit: commit eb708ce Author: Baoquan He Date: Tue Jul 2 11:11:07 2013 +0900 [PATCH 2/2] Add help and man message for '--help'. Conventionally '-h' and '--help' are all provided. Currently makedumpfile lacks help and man message for '--help'. Here add it. Signed-off-by: Baoquan He It's needed for applying commit 414d3ed ("Add --non-mmap option to disable mmap() manually"). Signed-off-by: WANG Chao Acked-by: Vivek Goyal --- ...le-Add-help-and-man-message-for-help.patch | 43 +++++++++++++++++++ kexec-tools.spec | 2 + 2 files changed, 45 insertions(+) create mode 100644 kexec-tools-2.0.4-makedumpfile-Add-help-and-man-message-for-help.patch diff --git a/kexec-tools-2.0.4-makedumpfile-Add-help-and-man-message-for-help.patch b/kexec-tools-2.0.4-makedumpfile-Add-help-and-man-message-for-help.patch new file mode 100644 index 0000000..c834227 --- /dev/null +++ b/kexec-tools-2.0.4-makedumpfile-Add-help-and-man-message-for-help.patch @@ -0,0 +1,43 @@ +From eb708cedde4ed48dde5a918a23b2c3b8235df6c5 Mon Sep 17 00:00:00 2001 +From: Baoquan He +Date: Tue, 2 Jul 2013 11:11:07 +0900 +Subject: [PATCH 2/2] [PATCH 2/2] Add help and man message for '--help'. + +Conventionally '-h' and '--help' are all provided. Currently makedumpfile +lacks help and man message for '--help'. Here add it. + +Signed-off-by: Baoquan He +--- + makedumpfile.8 | 2 +- + print_info.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/makedumpfile-1.5.4/makedumpfile.8 b/makedumpfile-1.5.4/makedumpfile.8 +index adeb811..f50a011 100644 +--- a/makedumpfile-1.5.4/makedumpfile.8 ++++ b/makedumpfile-1.5.4/makedumpfile.8 +@@ -539,7 +539,7 @@ order from left to right. \fIVMCORE\fRs are assembled into a single + Print debugging message. + + .TP +-\fB\-h\fR ++\fB\-h (\-\-help)\fR + Show help message and LZO/snappy support status (enabled/disabled). + + .TP +diff --git a/makedumpfile-1.5.4/print_info.c b/makedumpfile-1.5.4/print_info.c +index 06939e0..3527970 100644 +--- a/makedumpfile-1.5.4/print_info.c ++++ b/makedumpfile-1.5.4/print_info.c +@@ -255,7 +255,7 @@ print_usage(void) + MSG(" [-f]:\n"); + MSG(" Overwrite DUMPFILE even if it already exists.\n"); + MSG("\n"); +- MSG(" [-h]:\n"); ++ MSG(" [-h, --help]:\n"); + MSG(" Show help message and LZO/snappy support status (enabled/disabled).\n"); + MSG("\n"); + MSG(" [-v]:\n"); +-- +1.8.4.2 + diff --git a/kexec-tools.spec b/kexec-tools.spec index 78a8277..1edd4ed 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -91,6 +91,7 @@ Patch609: kexec-tools-2.0.4-makedumpfile-cache-Allocate-buffers-at-initializatio Patch610: kexec-tools-2.0.4-makedumpfile-cache-Reuse-entry-in-pending-list.patch Patch612: kexec-tools-2.0.4-makedumpfile-Understand-v3.11-rc4-dmesg.patch Patch613: kexec-tools-2.0.4-makedumpfile-Assign-non-printable-value-as-short-option.patch +Patch614: kexec-tools-2.0.4-makedumpfile-Add-help-and-man-message-for-help.patch %description kexec-tools provides /sbin/kexec binary that facilitates a new @@ -135,6 +136,7 @@ tar -z -x -v -f %{SOURCE19} %patch612 -p1 %patch302 -p1 %patch613 -p1 +%patch614 -p1 tar -z -x -v -f %{SOURCE13}