Libguestfs - Oct 2010 - [PATCH] Don't use kernel module whitelist with ext2-based appliance.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
New in Fedora 11: Fedora Windows cross-compiler. Compile Windows
programs, test, and build Windows installers. Over 70 libraries supprt'd
http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw
-------------- next part --------------
>From dba9b0377d29cb937fcef3861eae4f722aced323 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Wed, 27 Oct 2010 10:31:41 +0100
Subject: [PATCH 1/2] 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.
---
 src/appliance.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/src/appliance.c b/src/appliance.c
index cbbe437..80f0f46 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;
-- 
1.7.3.1

On 27/10/10 10:34, Richard W.M. Jones wrote:
> From: Richard W.M. Jones<rjones at redhat.com>
> Date: Wed, 27 Oct 2010 10:31:41 +0100
> Subject: [PATCH 1/2] 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.
> ---
>   src/appliance.c |    6 ------
>   1 files changed, 0 insertions(+), 6 deletions(-)
Works here. Looks good. ACK.

Matt
-- 
Matthew Booth, RHCA, RHCSS
Red Hat Engineering, Virtualisation Team

GPG ID:  D33C3490
GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490