summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2010-10-27 10:31:41 +0100
committerRichard W.M. Jones <rjones@redhat.com>2010-10-27 10:59:44 +0100
commitec736e20d32febefa2fe35d503886e0999146f0e (patch)
tree52240214b9b728ba8c2ef3a4765a7842c0053d82
parent61da709722ec244da1c3c7d4f1a8706f76687cb3 (diff)
downloadlibguestfs-ec736e20d32febefa2fe35d503886e0999146f0e.tar.gz
libguestfs-ec736e20d32febefa2fe35d503886e0999146f0e.tar.xz
libguestfs-ec736e20d32febefa2fe35d503886e0999146f0e.zip
Don't use kernel module whitelist with ext2-based appliance.
Since the ext2-based appliance is cached, and since it is not all loaded into memory (as with the initrd), we might as well put all the kernel modules in there. Note the kmod.whitelist.in file is still used for building the ordinary appliance.
-rw-r--r--src/appliance.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/appliance.c b/src/appliance.c
index 163d7700..28f1595f 100644
--- a/src/appliance.c
+++ b/src/appliance.c
@@ -162,11 +162,9 @@ calculate_supermin_checksum (guestfs_h *g, const char *supermin_path)
snprintf (cmd, len,
"febootstrap-supermin-helper%s "
"-f checksum "
- "-k '%s/kmod.whitelist' "
"'%s/supermin.d' "
host_cpu,
g->verbose ? " --verbose" : "",
- supermin_path,
supermin_path);
if (g->verbose)
@@ -435,10 +433,6 @@ run_supermin_helper (guestfs_h *g, const char *supermin_path,
argv[i++] = "--verbose";
argv[i++] = "-f";
argv[i++] = "ext2";
- argv[i++] = "-k";
- char whitelist[pathlen + 32];
- snprintf (whitelist, pathlen + 32, "%s/kmod.whitelist", supermin_path);
- argv[i++] = whitelist;
char supermin_d[pathlen + 32];
snprintf (supermin_d, pathlen + 32, "%s/supermin.d", supermin_path);
argv[i++] = supermin_d;