Revert "Add 'set-kernel'/'get-kernel'/LIBGUESTFS_KERNEL to override appliance kernel."

This reverts commit 34d2df41626f1ee4172a6d40b06d72d6ed9d6348.

1 files changed, 1 insertions, 24 deletions

diff --git a/src/guestfs.c b/src/guestfs.c
index 5750a4f4..db6db910 100644
--- a/src/guestfs.c
+++ b/src/guestfs.c
@@ -174,7 +174,6 @@ struct guestfs_h
   char *path;			/* Path to kernel, initrd. */
   char *qemu;			/* Qemu binary. */
   char *append;			/* Append to kernel command line. */
-  char *kernel;			/* Override appliance kernel. */
 
   int memsize;			/* Size of RAM (megabytes). */
 
@@ -250,12 +249,6 @@ guestfs_create (void)
     if (!g->append) goto error;
   }
 
-  str = getenv ("LIBGUESTFS_KERNEL");
-  if (str) {
-    g->kernel = strdup (str);
-    if (!g->kernel) goto error;
-  }
-
   /* Choose a suitable memory size.  Previously we tried to choose
    * a minimal memory size, but this isn't really necessary since
    * recent QEMU and KVM don't do anything nasty like locking
@@ -681,22 +674,6 @@ guestfs_get_append (guestfs_h *g)
 }
 
 int
-guestfs_set_kernel (guestfs_h *g, const char *kernel)
-{
-  free (g->kernel);
-  g->kernel = NULL;
-
-  g->kernel = kernel ? safe_strdup (g, kernel) : NULL;
-  return 0;
-}
-
-const char *
-guestfs_get_kernel (guestfs_h *g)
-{
-  return g->kernel;
-}
-
-int
 guestfs_set_memsize (guestfs_h *g, int memsize)
 {
   g->memsize = memsize;
@@ -1081,7 +1058,7 @@ guestfs_launch (guestfs_h *g)
     add_cmdline (g, memsize_str);
     add_cmdline (g, "-no-reboot"); /* Force exit instead of reboot on panic */
     add_cmdline (g, "-kernel");
-    add_cmdline (g, g->kernel ? : (char *) kernel);
+    add_cmdline (g, (char *) kernel);
     add_cmdline (g, "-initrd");
     add_cmdline (g, (char *) initrd);
     add_cmdline (g, "-append");