Update of /cvsroot/mkdump/mkexec/3.0/2.6/arch/i386/kernel
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv4504/arch/i386/kernel
Modified Files:
mkexec-vmlinux.c
Log Message:
bug fix: bug: crash if mini kernel is "Initial RAM disk (initrd) suppor" on
and not use initrd.
Index: mkexec-vmlinux.c
===================================================================
RCS file: /cvsroot/mkdump/mkexec/3.0/2.6/arch/i386/kernel/mkexec-vmlinux.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mkexec-vmlinux.c 9 Mar 2006 23:47:59 -0000 1.3
--- mkexec-vmlinux.c 13 Jun 2006 00:44:51 -0000 1.4
***************
*** 291,295 ****
real_mode->loader_type = LOADER_TYPE_UNKNOWN;
/* The ramdisk */
! if (image->minik_type == MINIK_V3) {
real_mode->initrd_start = image->segment[2].mem;
real_mode->initrd_size = image->segment[2].memsz;
--- 291,295 ----
real_mode->loader_type = LOADER_TYPE_UNKNOWN;
/* The ramdisk */
! if (image->nr_segments == 3) {
real_mode->initrd_start = image->segment[2].mem;
real_mode->initrd_size = image->segment[2].memsz;
|
