[PATCH] kexec-tools: Add --append option for s390

Michael Holzheu holzheu at linux.vnet.ibm.com
Wed Sep 7 04:42:50 EDT 2011


Hello Simon,

From: Michael Holzheu <holzheu at linux.vnet.ibm.com>

All architectures define the "--append" option together with the
"--command-line" option to specify kernel parameters. This option
is also used by kdump init scripts. In order to be compatible this
patch introduces the "--append" option also for s390. In addition
to that the help text is adjusted so that it is now the same as on
all other architectures.

Signed-off-by: Michael Holzheu <holzheu at linux.vnet.ibm.com>
---
 kexec/arch/s390/include/arch/options.h |    1 +
 kexec/arch/s390/kexec-image.c          |    4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

--- a/kexec/arch/s390/include/arch/options.h
+++ b/kexec/arch/s390/include/arch/options.h
@@ -30,6 +30,7 @@
 #define KEXEC_ALL_OPTIONS				\
 	KEXEC_ARCH_OPTIONS				\
 	{"command-line",     1, 0, OPT_APPEND},		\
+	{"append",           1, 0, OPT_APPEND},		\
 	{"initrd",	     1, 0, OPT_RAMDISK},
 
 #define KEXEC_ALL_OPT_STR KEXEC_ARCH_OPT_STR
--- a/kexec/arch/s390/kexec-image.c
+++ b/kexec/arch/s390/kexec-image.c
@@ -61,6 +61,7 @@ image_s390_load(int argc, char **argv, c
 		{
 			KEXEC_OPTIONS
 			{"command-line",     1, 0, OPT_APPEND},
+			{"append",           1, 0, OPT_APPEND},
 			{"initrd",           1, 0, OPT_RAMDISK},
 			{0,                  0, 0, 0},
 		};
@@ -160,7 +161,8 @@ image_s390_probe(const char *UNUSED(kern
 void
 image_s390_usage(void)
 {
-	printf("--command-line=STRING Pass a custom command line STRING to the kernel.\n"
+	printf("--command-line=STRING Set the kernel command line to STRING.\n"
+	       "--append=STRING       Set the kernel command line to STRING.\n"
 	       "--initrd=FILENAME     Use the file FILENAME as a ramdisk.\n"
 		);
 }





More information about the kexec mailing list