X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Fappliance.c;h=b6854b0044c7407b4325766583b6f1be359c0c59;hb=d72815578f7b8fea9702902d8562430e8a007a46;hp=26f526172b6850fdda20070b2513f38c5497c553;hpb=4e656a61d40ff51e63aa06d857c40c14ff31ddb9;p=libguestfs.git

diff --git a/src/appliance.c b/src/appliance.c
index 26f5261..b6854b0 100644
--- a/src/appliance.c
+++ b/src/appliance.c
@@ -41,6 +41,7 @@
 #include "guestfs-internal-actions.h"
 #include "guestfs_protocol.h"
 
+/* Old-style appliance is going to be obsoleted. */
 static const char *kernel_name = "vmlinuz." host_cpu;
 static const char *initrd_name = "initramfs." host_cpu ".img";
 
@@ -48,13 +49,11 @@ static int find_path (guestfs_h *g, int (*pred) (guestfs_h *g, const char *pelem
 static int dir_contains_file (const char *dir, const char *file);
 static int dir_contains_files (const char *dir, ...);
 static int contains_ordinary_appliance (guestfs_h *g, const char *path, void *data);
-#if ENABLE_SUPERMIN
 static int contains_supermin_appliance (guestfs_h *g, const char *path, void *data);
 static char *calculate_supermin_checksum (guestfs_h *g, const char *supermin_path);
 static int check_for_cached_appliance (guestfs_h *g, const char *supermin_path, const char *checksum, char **kernel, char **initrd, char **appliance);
 static int build_supermin_appliance (guestfs_h *g, const char *supermin_path, const char *checksum, char **kernel, char **initrd, char **appliance);
 static int run_supermin_helper (guestfs_h *g, const char *supermin_path, const char *cachedir, size_t cdlen);
-#endif
 
 /* Locate or build the appliance.
  *
@@ -90,7 +89,6 @@ guestfs___build_appliance (guestfs_h *g,
 {
   int r;
 
-#if ENABLE_SUPERMIN
   /* Step (1). */
   char *supermin_path;
   r = find_path (g, contains_supermin_appliance, NULL, &supermin_path);
@@ -119,7 +117,6 @@ guestfs___build_appliance (guestfs_h *g,
     }
     free (supermin_path);
   }
-#endif
 
   /* Step (5). */
   char *path;
@@ -150,11 +147,10 @@ contains_ordinary_appliance (guestfs_h *g, const char *path, void *data)
   return dir_contains_files (path, kernel_name, initrd_name, NULL);
 }
 
-#if ENABLE_SUPERMIN
 static int
 contains_supermin_appliance (guestfs_h *g, const char *path, void *data)
 {
-  return dir_contains_files (path, "supermin.d", "kmod.whitelist", NULL);
+  return dir_contains_files (path, "supermin.d", NULL);
 }
 
 /* supermin_path is a path which is known to contain a supermin
@@ -536,7 +532,6 @@ run_supermin_helper (guestfs_h *g, const char *supermin_path,
   perror ("execvp");
   _exit (EXIT_FAILURE);
 }
-#endif
 
 /* Search elements of g->path, returning the first path element which
  * matches the predicate function 'pred'.