Add the "initrd" command

[gpxe.git] / src / hci / commands / image_cmd.c

diff --git a/src/hci/commands/image_cmd.c b/src/hci/commands/image_cmd.c
index 0dc1655..900886f 100644 (file)
--- a/src/hci/commands/image_cmd.c
+++ b/src/hci/commands/image_cmd.c
@@ -18,11 +18,13 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#include <errno.h>
 #include <libgen.h>
 #include <getopt.h>
 #include <vsprintf.h>
 #include <gpxe/image.h>
 #include <gpxe/command.h>
+#include <gpxe/initrd.h>
 #include <usr/imgmgmt.h>
 
 /** @file
@@ -72,16 +74,17 @@ static void imgfetch_core_syntax ( char **argv, int load ) {
  *
  * @v argc             Argument count
  * @v argv             Argument list
- * @v load             Load image after fetching
- * @ret rc             Exit code
+ * @v load             Image will be automatically loaded after fetching
+ * @ret image          Fetched image
+ * @ret rc             Return status code
  */
-static int imgfetch_core_exec ( int argc, char **argv, int load ) {
+static int imgfetch_core_exec ( int argc, char **argv, int load,
+                               struct image **image ) {
        static struct option longopts[] = {
                { "help", 0, NULL, 'h' },
                { "name", required_argument, NULL, 'n' },
                { NULL, 0, NULL, 0 },
        };
-       struct image *image;
        const char *name = NULL;
        char *filename;
        int c;
@@ -100,36 +103,27 @@ static int imgfetch_core_exec ( int argc, char **argv, int load ) {
                default:
                        /* Unrecognised/invalid option */
                        imgfetch_core_syntax ( argv, load );
-                       return 1;
+                       return -EINVAL;
                }
        }
 
        /* Need at least a filename remaining after the options */
        if ( optind == argc ) {
                imgfetch_core_syntax ( argv, load );
-               return 1;
+               return -EINVAL;
        }
        filename = argv[optind++];
        if ( ! name )
                name = basename ( filename );
 
        /* Fetch the image */
-       if ( ( rc = imgfetch ( filename, name, &image ) ) != 0 ) {
+       if ( ( rc = imgfetch ( filename, name, image ) ) != 0 ) {
                printf ( "Could not fetch %s: %s\n", name, strerror ( rc ) );
-               return 1;
+               return rc;
        }
 
        /* Fill in command line */
-       imgfill_cmdline ( image, ( argc - optind ), &argv[optind] );
-
-       /* Load image if required */
-       if ( load ) {
-               if ( ( rc = imgload ( image ) ) != 0 ) {
-                       printf ( "Could not load %s: %s\n", name,
-                                strerror ( rc ) );
-                       return 1;
-               }
-       }
+       imgfill_cmdline ( *image, ( argc - optind ), &argv[optind] );
 
        return 0;
 }
@@ -142,7 +136,13 @@ static int imgfetch_core_exec ( int argc, char **argv, int load ) {
  * @ret rc             Exit code
  */
 static int imgfetch_exec ( int argc, char **argv ) {
-       return imgfetch_core_exec ( argc, argv, 0 );
+       struct image *image;
+       int rc;
+
+       if ( ( rc = imgfetch_core_exec ( argc, argv, 0, &image ) ) != 0 )
+               return 1;
+
+       return 0;
 }
 
 /**
@@ -153,7 +153,40 @@ static int imgfetch_exec ( int argc, char **argv ) {
  * @ret rc             Exit code
  */
 static int kernel_exec ( int argc, char **argv ) {
-       return imgfetch_core_exec ( argc, argv, 1  );
+       struct image *image;
+       int rc;
+
+       if ( ( rc = imgfetch_core_exec ( argc, argv, 1, &image ) != 0 ) )
+               return 1;
+
+       /* Load image */
+       if ( ( rc = imgload ( image ) ) != 0 ) {
+               printf ( "Could not load %s: %s\n", image->name,
+                        strerror ( rc ) );
+               return 1;
+       }
+
+       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 ) {
+       struct image *image;
+       int rc;
+
+       if ( ( rc = imgfetch_core_exec ( argc, argv, 0, &image ) != 0 ) )
+               return 1;
+
+       /* Mark image as an intird */
+       image->type = &initrd_image_type;
+
+       return 0;
 }
 
 /**
@@ -304,7 +337,7 @@ static int imgexec_exec ( int argc, char **argv ) {
                { NULL, 0, NULL, 0 },
        };
        struct image *image;
-       const char *name;
+       const char *name = NULL;
        int c;
        int rc;
 
@@ -320,21 +353,32 @@ static int imgexec_exec ( int argc, char **argv ) {
                }
        }
 
-       /* Need exactly one image name */
-       if ( optind != ( argc - 1 ) ) {
+       /* Need no more than one image name */
+       if ( optind != argc )
+               name = argv[optind++];
+       if ( optind != argc ) {
                imgexec_syntax ( argv );
                return 1;
        }
-       name = argv[optind];
        
        /* Execute specified image */
-       image = find_image ( name );
-       if ( ! image ) {
-               printf ( "No such image: %s\n", name );
-               return 1;
+       if ( name ) {
+               image = find_image ( name );
+               if ( ! image ) {
+                       printf ( "No such image: %s\n", name );
+                       return 1;
+               }
+       } else {
+               image = imgautoselect();
+               if ( ! image ) {
+                       printf ( "No loaded images\n" );
+                       return 1;
+               }
        }
+
        if ( ( rc = imgexec ( image ) ) != 0 ) {
-               printf ( "Could not execute %s: %s\n", name, strerror ( rc ) );
+               printf ( "Could not execute %s: %s\n",
+                        image->name, strerror ( rc ) );
                return 1;
        }
 
@@ -448,7 +492,6 @@ static int imgfree_exec ( int argc, char **argv ) {
        return 0;
 }
 
-
 /** Image management commands */
 struct command image_commands[] __command = {
        {
@@ -463,6 +506,10 @@ struct command image_commands[] __command = {
                .name = "kernel",
                .exec = kernel_exec,
        },
+       {
+               .name = "initrd",
+               .exec = initrd_exec,
+       },
        {
                .name = "imgload",
                .exec = imgload_exec,
@@ -475,6 +522,10 @@ struct command image_commands[] __command = {
                .name = "imgexec",
                .exec = imgexec_exec,
        },
+       {
+               .name = "boot", /* synonym for "imgexec" */
+               .exec = imgexec_exec,
+       },
        {
                .name = "imgstat",
                .exec = imgstat_exec,