rpms/kexec-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Related: bz 221272

Browse Source
This commit is contained in:
Neil Horman 2007-01-04 19:19:31 +00:00
parent fd52a40fb4
commit ea8c6f7f61
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
kexec-tools-1.101-bzimage-options.patch Normal file
View File

@ -0,0 +1,34 @@
--- kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c.orig 2007-01-04 13:58:06.000000000 -0500
+++ kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c 2007-01-04 14:14:07.000000000 -0500
@@ -234,6 +234,9 @@ int bzImage_load(int argc, char **argv,
#define OPT_APPEND (OPT_ARCH_MAX+0)
#define OPT_RAMDISK (OPT_ARCH_MAX+1)
#define OPT_REAL_MODE (OPT_ARCH_MAX+2)
+#define OPT_ARGS_ELF (OPT_ARCH_MAX+3)
+#define OPT_ARGS_LINUX (OPT_ARCH_MAX+4)
+#define OPT_ARGS_NONE (OPT_ARCH_MAX+5)
static const struct option options[] = {
KEXEC_ARCH_OPTIONS
{ "debug", 0, 0, OPT_DEBUG },
@@ -242,6 +245,9 @@ int bzImage_load(int argc, char **argv,
{ "initrd", 1, 0, OPT_RAMDISK },
{ "ramdisk", 1, 0, OPT_RAMDISK },
{ "real-mode", 0, 0, OPT_REAL_MODE },
+ { "args-elf", 0, NULL, OPT_ARGS_ELF },
+ { "args-linux", 0, NULL, OPT_ARGS_LINUX },
+ { "args-none", 0, NULL, OPT_ARGS_NONE },
{ 0, 0, 0, 0 },
};
static const char short_options[] = KEXEC_ARCH_OPT_STR "d";
@@ -276,6 +282,11 @@ int bzImage_load(int argc, char **argv,
case OPT_REAL_MODE:
real_mode_entry = 1;
break;
+ case OPT_ARGS_ELF:
+ case OPT_ARGS_LINUX:
+ case OPT_ARGS_NONE:
+ /* we can ignore these options */
+ break;
}
}
command_line_len = 0;

6
kexec-tools.spec
View File

@ -1,6 +1,6 @@
Name: kexec-tools
Version: 1.101
Release: 55%{?dist}
Release: 56%{?dist}
License: GPL
Group: Applications/System
Summary: The kexec/kdump userspace component.
@ -222,10 +222,10 @@ rm -f %{_datadir}/firstboot/modules/firstboot_kdump.py
%doc kexec-kdump-howto.txt
%changelog
* Thu Jan 04 2007 Neil Horman <nhorman@redhat.com> - 1.101-6%{dist}
* Thu Jan 04 2007 Neil Horman <nhorman@redhat.com> - 1.101-56%{dist}
- Fix option parsing problem for bzImage files (bz 221272)
* Fri Dec 15 2006 Neil Horman <nhorman@redhat.com> - 1.101-5%{dist}
* Fri Dec 15 2006 Neil Horman <nhorman@redhat.com> - 1.101-55%{dist}
- Wholesale update of RHEL5 revisions 55-147
* Tue Aug 29 2006 Neil Horman <nhorman@redhat.com> - 1.101-54%{dist}