rpms/kexec-tools/F-9 kexec-tools-1.102pre-typos.patch, NONE, 1.1 kexec-tools.spec, 1.114, 1.115

Neil Horman (nhorman) fedora-extras-commits at redhat.com
Tue Jul 15 18:28:48 UTC 2008


Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30493

Modified Files:
	kexec-tools.spec 
Added Files:
	kexec-tools-1.102pre-typos.patch 
Log Message:
Resolves: bz 455148

kexec-tools-1.102pre-typos.patch:

--- NEW FILE kexec-tools-1.102pre-typos.patch ---
diff -up kexec-tools-testing-20070330/kdump/kdump.c.orig kexec-tools-testing-20070330/kdump/kdump.c
--- kexec-tools-testing-20070330/kdump/kdump.c.orig	2008-07-15 13:41:02.000000000 -0400
+++ kexec-tools-testing-20070330/kdump/kdump.c	2008-07-15 13:41:09.000000000 -0400
@@ -235,7 +235,7 @@ int main(int argc, char **argv)
 	}
 	start_addr = strtoull(start_addr_str, &end, 0);
 	if ((start_addr_str == end) || (*end != '\0')) {
-		fprintf(stderr, "Bad core dump start addres: %s\n",
+		fprintf(stderr, "Bad core dump start address: %s\n",
 			start_addr_str);
 		exit(2);
 	}
diff -up kexec-tools-testing-20070330/kexec/kexec.8.orig kexec-tools-testing-20070330/kexec/kexec.8
--- kexec-tools-testing-20070330/kexec/kexec.8.orig	2008-07-15 12:56:10.000000000 -0400
+++ kexec-tools-testing-20070330/kexec/kexec.8	2008-07-15 13:04:12.000000000 -0400
@@ -144,7 +144,7 @@ Specify the highest memory address
 to load code into.
 
 .SH SUPPORTED KERNEL FILE TYPES AND OPTIONS
-.B Beoboot-x86
+.B beoboot-x86
 .RS
 .TP
 .B \-\-args\-elf
@@ -183,6 +183,41 @@ Use
 as the kernel's initial ramdisk.
 .RE
 .PP
+.B bzImage-x86
+.RS
+.TP
+.BI \-\-append= string
+Append
+.I string
+to the kernel command line.
+.TP
+.BI \-\-command\-line= string
+Set the kernel command line to
+.IR string .
+.TP
+.BI \-\-reuse-cmdline
+Use the command line from the running system. When a panic kernel is loaded, it
+strips the
+.I
+crashkernel
+parameter automatically. The
+.I BOOT_IMAGE
+parameter is also stripped.
+.TP
+.BI \-\-initrd= file
+Use
+.I file
+as the kernel's initial ramdisk.
+.TP
+.BI \-\-ramdisk= file
+Use
+.I file
+as the kernel's initial ramdisk.
+.TP
+.BI \-\-real-mode
+Use real-mode entry point.
+.RE
+.PP
 .B multiboot-x86
 .RS
 .TP
diff -up kexec-tools-testing-20070330/kexec/arch/i386/kexec-x86.c.orig kexec-tools-testing-20070330/kexec/arch/i386/kexec-x86.c
--- kexec-tools-testing-20070330/kexec/arch/i386/kexec-x86.c.orig	2008-07-15 13:28:25.000000000 -0400
+++ kexec-tools-testing-20070330/kexec/arch/i386/kexec-x86.c	2008-07-15 13:28:31.000000000 -0400
@@ -131,7 +131,7 @@ void arch_usage(void)
 	printf(
 		"     --reset-vga               Attempt to reset a standard vga device\n"
 		"     --serial=<port>           Specify the serial port for debug output\n"
-		"     --serial-baud=<buad_rate> Specify the serial port baud rate\n"
+		"     --serial-baud=<baud_rate> Specify the serial port baud rate\n"
 		"     --console-vga             Enable the vga console\n"
 		"     --console-serial          Enable the serial console\n"
 		"     --elf32-core-headers      Prepare core headers in ELF32 format\n"
diff -up kexec-tools-testing-20070330/kexec/arch/x86_64/kexec-x86_64.c.orig kexec-tools-testing-20070330/kexec/arch/x86_64/kexec-x86_64.c
--- kexec-tools-testing-20070330/kexec/arch/x86_64/kexec-x86_64.c.orig	2008-07-15 13:28:41.000000000 -0400
+++ kexec-tools-testing-20070330/kexec/arch/x86_64/kexec-x86_64.c	2008-07-15 13:28:47.000000000 -0400
@@ -133,7 +133,7 @@ void arch_usage(void)
 	printf(
 		"     --reset-vga               Attempt to reset a standard vga device\n"
 		"     --serial=<port>           Specify the serial port for debug output\n"
-		"     --serial-baud=<buad_rate> Specify the serial port baud rate\n"
+		"     --serial-baud=<baud_rate> Specify the serial port baud rate\n"
 		"     --console-vga             Enable the vga console\n"
 		"     --console-serial          Enable the serial console\n"
 		);


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/F-9/kexec-tools.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- kexec-tools.spec	14 Jul 2008 13:46:36 -0000	1.114
+++ kexec-tools.spec	15 Jul 2008 18:27:56 -0000	1.115
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.102pre 
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -69,6 +69,7 @@
 Patch605: kexec-tools-1.102pre-vmcoreinfo.patch
 Patch606: kexec-tools-1.102pre-makedumpfile-makefile.patch
 Patch607: kexec-tools-1.102pre-cmdline-length.patch
+Patch608: kexec-tools-1.102pre-typos.patch
 
 %description
 kexec-tools provides /sbin/kexec binary that facilitates a new
@@ -101,6 +102,7 @@
 %patch605 -p1
 %patch606 -p1
 %patch607 -p1
+%patch608 -p1
 
 tar -z -x -v -f %{SOURCE13}
 
@@ -229,6 +231,9 @@
 %doc kexec-kdump-howto.txt
 
 %changelog
+* Tue Jul 15 2008 Neil Horman <nhorman at redhat.com> - 1.102pre-11
+- Fix up some misc typos (bz 455148)
+
 * Mon Jul 14 2008 Neil Horman <nhorman at redhat.com> - 1.102pre-10
 - Fix mkdumprd to support dynamic build busybox (bz 443878)
 




More information about the fedora-extras-commits mailing list