[PATCH 0/3] change/add help message of options

[PATCH 0/3] change/add help message of options

[Baoquan He]

Currently, help message of several options are missed or not correct,
change/add it in this patchset.

Options not present in help:
* --entry

Options not present in man:
* --entry
* --load-jump-back-helper
* --load-preserve-context
* --reuseinitrd 

Options not correct in man:
* --debug

Baoquan He (3):
  kexec man page change for debug option
  add description for entry option in help and man page
  add missed options to man page

 kexec/kexec.8 |   19 ++++++++++++++++---
 kexec/kexec.c |    4 ++++
 2 files changed, 20 insertions(+), 3 deletions(-)


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

[PATCH 1/3] kexec man page change for debug option

[Baoquan He]

In commit 28d4ab53, the arch-specific --debug are moved to
generic place, but the relevant description was not updated
accordingly in man page. Here change it.

Signed-off-by: Baoquan He <bhe@redhat.com>
---
 kexec/kexec.8 |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kexec/kexec.8 b/kexec/kexec.8
index aff674c..120af4d 100644
--- a/kexec/kexec.8
+++ b/kexec/kexec.8
@@ -104,6 +104,9 @@ command:
 
 .SH OPTIONS
 .TP
+.B \-d\ (\-\-debug)
+Enable debugging messages.
+.TP
 .B \-e\ (\-\-exec)
 Run the currently loaded kernel. Note that it will reboot into the loaded kernel without calling shutdown(8).
 .TP
@@ -167,9 +170,6 @@ Pass ELF boot notes.
 .B \-\-args\-linux
 Pass Linux kernel style options.
 .TP
-.B \-d \ (\-\-debug)
-Enable debugging messages.
-.TP
 .B \-\-real\-mode
 Use the kernel's real mode entry point.
 .RE
-- 
1.7.1


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

[PATCH 2/3] add description for entry option in help and man page

[Baoquan He]

"--entry" option is used to specify jump back entry address, but
lack description in help message and man page. Now add it.

Signed-off-by: Baoquan He <bhe@redhat.com>
---
 kexec/kexec.8 |    3 +++
 kexec/kexec.c |    4 ++++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/kexec/kexec.8 b/kexec/kexec.8
index 120af4d..2f94448 100644
--- a/kexec/kexec.8
+++ b/kexec/kexec.8
@@ -159,6 +159,9 @@ to load code into.
 Specify the highest memory address
 .I addr
 to load code into.
+.TP
+.BI \-\-entry= addr
+Specify the jump back address. (0 means it's not jump back or preserve context)
 
 .SH SUPPORTED KERNEL FILE TYPES AND OPTIONS
 .B Beoboot-x86
diff --git a/kexec/kexec.c b/kexec/kexec.c
index 6a13f79..21ff0e7 100644
--- a/kexec/kexec.c
+++ b/kexec/kexec.c
@@ -905,6 +905,10 @@ void usage(void)
 	       "                      context of current kernel during kexec.\n"
 	       "     --load-jump-back-helper Load a helper image to jump back\n"
 	       "                      to original kernel.\n"
+	       "     --entry=<addr>   Specify jump back address.\n"
+	       "                      (0 means it's not jump back or\n"
+	       "                      preserve context)\n"
+	       "                      to original kernel.\n"
 	       " -d, --debug           Enable debugging to help spot a failure.\n"
 	       "\n"
 	       "Supported kernel file types and options: \n");
-- 
1.7.1


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

[PATCH 3/3] add missed options to man page

[Baoquan He]

several options are missed in man page, add it now. They are
--reuseinitrd, --load-preserve-context, --load-jump-back-helper
and --entry=<addr>.

Signed-off-by: Baoquan He <bhe@redhat.com>
---
 kexec/kexec.8 |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/kexec/kexec.8 b/kexec/kexec.8
index 2f94448..2575f9e 100644
--- a/kexec/kexec.8
+++ b/kexec/kexec.8
@@ -162,6 +162,16 @@ to load code into.
 .TP
 .BI \-\-entry= addr
 Specify the jump back address. (0 means it's not jump back or preserve context)
+.TP
+.BI \-\-load\-preserve\-context
+Load the new kernel and preserve context of current kernel during kexec.
+.TP
+.BI \-\-load\-jump\-back\-helper
+Load a helper image to jump back to original kernel.
+.TP
+.BI \-\-reuseinitrd
+Reuse initrd from first boot.
+
 
 .SH SUPPORTED KERNEL FILE TYPES AND OPTIONS
 .B Beoboot-x86
-- 
1.7.1


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH 0/3] change/add help message of options

[Simon Horman]

On Mon, Jun 03, 2013 at 05:38:37PM +0800, Baoquan He wrote:
> Currently, help message of several options are missed or not correct,
> change/add it in this patchset.
> 
> Options not present in help:
> * --entry
> 
> Options not present in man:
> * --entry
> * --load-jump-back-helper
> * --load-preserve-context
> * --reuseinitrd 
> 
> Options not correct in man:
> * --debug
> 
> Baoquan He (3):
>   kexec man page change for debug option
>   add description for entry option in help and man page
>   add missed options to man page
> 
>  kexec/kexec.8 |   19 ++++++++++++++++---
>  kexec/kexec.c |    4 ++++
>  2 files changed, 20 insertions(+), 3 deletions(-)

Thanks, all three patches applied.

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec