mirror of
https://github.com/ipxe/ipxe
synced 2025-12-13 07:20:47 +03:00
[bzimage] Kill off the initrd image type
We can just treat all non-kernel images as initrds, which matches our behaviour for multiboot kernels. This allows us to eliminate initrd as an image type, and treat the "initrd" command as just another synonym for "imgfetch".
This commit is contained in:
@@ -34,7 +34,6 @@
|
||||
#include <gpxe/image.h>
|
||||
#include <gpxe/segment.h>
|
||||
#include <gpxe/init.h>
|
||||
#include <gpxe/initrd.h>
|
||||
#include <gpxe/cpio.h>
|
||||
#include <gpxe/features.h>
|
||||
|
||||
@@ -188,8 +187,8 @@ static size_t bzimage_load_initrd ( struct image *image,
|
||||
struct cpio_header cpio;
|
||||
size_t offset = 0;
|
||||
|
||||
/* Ignore images which aren't initrds */
|
||||
if ( initrd->type != &initrd_image_type )
|
||||
/* Do not include kernel image itself as an initrd */
|
||||
if ( initrd == image )
|
||||
return 0;
|
||||
|
||||
/* Create cpio header before non-prebuilt images */
|
||||
|
||||
Reference in New Issue
Block a user