From dbe9269f3a04267b27bd5528715e79bacc356703 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Tue, 8 Jul 2008 01:30:11 +0100 Subject: [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". --- src/hci/commands/image_cmd.c | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) (limited to 'src/hci') diff --git a/src/hci/commands/image_cmd.c b/src/hci/commands/image_cmd.c index b651078b6..05e7ddeea 100644 --- a/src/hci/commands/image_cmd.c +++ b/src/hci/commands/image_cmd.c @@ -24,7 +24,6 @@ #include #include #include -#include #include /** @file @@ -222,23 +221,6 @@ static int kernel_exec ( int argc, char **argv ) { return 0; } -/** - * The "initrd" command - * - * @v argc Argument count - * @v argv Argument list - * @ret rc Exit code - */ -static int initrd_exec ( int argc, char **argv ) { - int rc; - - if ( ( rc = imgfetch_core_exec ( &initrd_image_type, IMG_FETCH, - argc, argv ) ) != 0 ) - return rc; - - return 0; -} - /** * "imgload" command syntax message * @@ -557,12 +539,12 @@ struct command image_commands[] __command = { .exec = imgfetch_exec, /* synonym for "imgfetch" */ }, { - .name = "kernel", - .exec = kernel_exec, + .name = "initrd", + .exec = imgfetch_exec, /* synonym for "imgfetch" */ }, { - .name = "initrd", - .exec = initrd_exec, + .name = "kernel", + .exec = kernel_exec, }, { .name = "imgload", -- cgit v1.2.3-55-g7522