sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-13 15:31:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Initrd concatenation now working

Browse Source
This commit is contained in:
Michael Brown
2007-08-01 15:29:15 +01:00
parent c5d9114064
commit 24f32a1945
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/arch/i386/image/bzimage.c
View File

@@ -186,10 +186,11 @@ static int bzimage_load_initrd ( struct image *image,
for_each_image ( initrd ) { for_each_image ( initrd ) {
if ( initrd->type != &initrd_image_type ) if ( initrd->type != &initrd_image_type )
continue; continue;
initrd_len = ( ( image->len + 0x0f ) & ~0x0f ); initrd_len = ( ( initrd->len + 0x0f ) & ~0x0f );
total_len += initrd_len; total_len += initrd_len;
} }
/* Give up if no initrd images found */
if ( ! total_len ) if ( ! total_len )
return 0; return 0;
@@ -225,7 +226,7 @@ static int bzimage_load_initrd ( struct image *image,
for_each_image ( initrd ) { for_each_image ( initrd ) {
if ( initrd->type != &initrd_image_type ) if ( initrd->type != &initrd_image_type )
continue; continue;
initrd_len = ( ( image->len + 0x0f ) & ~0x0f ); initrd_len = ( ( initrd->len + 0x0f ) & ~0x0f );
DBGC ( image, "bzImage %p has initrd %p at [%lx,%lx)\n", DBGC ( image, "bzImage %p has initrd %p at [%lx,%lx)\n",
image, initrd, ( start + offset ), image, initrd, ( start + offset ),
( start + offset + initrd->len ) ); ( start + offset + initrd->len ) );