Libguestfs - Aug 2009 - [PATCH] guestfs_modprobe: explicitly load a kernel module in the appliance

---
 daemon/Makefile.am |    1 +
 daemon/modprobe.c  |   43 +++++++++++++++++++++++++++++++++++++++++++
 po/POTFILES.in     |    1 +
 src/MAX_PROC_NR    |    2 +-
 src/generator.ml   |    7 +++++++
 5 files changed, 53 insertions(+), 1 deletions(-)
 create mode 100644 daemon/modprobe.c

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 097d89d..83ee408 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -54,6 +54,7 @@ guestfsd_SOURCES = \
 	lvm.c \
 	mkfs.c \
 	mknod.c \
+	modprobe.c \
 	mount.c \
 	names.c \
 	ntfs.c \
diff --git a/daemon/modprobe.c b/daemon/modprobe.c
new file mode 100644
index 0000000..8f92eca
--- /dev/null
+++ b/daemon/modprobe.c
@@ -0,0 +1,43 @@
+/* libguestfs - the guestfsd daemon
+ * Copyright (C) 2009 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "daemon.h"
+
+int
+do_modprobe (const char *module)
+{
+  const char *argv[] = {
+    "/sbin/modprobe",
+    NULL,
+    NULL
+  };
+
+  argv[1] = module;
+
+  char *out, *err;
+  int r = commandv (&out, &err, (char **) argv);
+
+  if (r == -1) {
+    reply_with_error ("%s", err);
+  }
+
+  free (out);
+  free (err);
+
+  return r;
+}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 33bf6e6..19eef99 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -30,6 +30,7 @@ daemon/ls.c
 daemon/lvm.c
 daemon/mkfs.c
 daemon/mknod.c
+daemon/modprobe.c
 daemon/mount.c
 daemon/names.c
 daemon/ntfs.c
diff --git a/src/MAX_PROC_NR b/src/MAX_PROC_NR
index 2455a46..205a12b 100644
--- a/src/MAX_PROC_NR
+++ b/src/MAX_PROC_NR
@@ -1 +1 @@
-193
+194
diff --git a/src/generator.ml b/src/generator.ml
index cc97dd5..41a78fe 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -3560,6 +3560,13 @@ an external journal on the journal with UUID
C<uuid>.
 
 See also C<guestfs_mke2journal_U>.");
 
+  ("modprobe", (RErr, [String "module"]), 194, [],
+   [InitNone, Always, TestRun [["modprobe"; "ext2"]]],
+   "load a kernel module",
+   "\
+This loads a kernel module in the appliance. The kernel module must be
available
+in the appliance.");
+
 ]
 
 let all_functions = non_daemon_functions @ daemon_functions
-- 
1.6.2.5

Try this updated patch:

- compiles without warnings
- improved the documentation a bit
- use 'command' instead of 'commandv' to simplify the code

ACK to this updated patch ...

Rich.

-- 
Richard Jones, Emerging Technologies, Red Hat  http://et.redhat.com/~rjones
virt-p2v converts physical machines to virtual machines.  Boot with a
live CD or over the network (PXE) and turn machines into Xen guests.
http://et.redhat.com/~rjones/virt-p2v
-------------- next part --------------
>From c8c3b2acd2e538179a752bd236e1a690f01ca86f Mon Sep 17 00:00:00 2001
From: Matthew Booth <mbooth at redhat.com>
Date: Tue, 18 Aug 2009 15:06:20 +0100
Subject: [PATCH] New 'modprobe' command.

Allow kernel modules to be loaded into the appliance.
---
 daemon/Makefile.am |    1 +
 daemon/modprobe.c  |   40 ++++++++++++++++++++++++++++++++++++++++
 po/POTFILES.in     |    1 +
 src/MAX_PROC_NR    |    2 +-
 src/generator.ml   |    9 +++++++++
 5 files changed, 52 insertions(+), 1 deletions(-)
 create mode 100644 daemon/modprobe.c

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 097d89d..83ee408 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -54,6 +54,7 @@ guestfsd_SOURCES = \
 	lvm.c \
 	mkfs.c \
 	mknod.c \
+	modprobe.c \
 	mount.c \
 	names.c \
 	ntfs.c \
diff --git a/daemon/modprobe.c b/daemon/modprobe.c
new file mode 100644
index 0000000..7e3d1b7
--- /dev/null
+++ b/daemon/modprobe.c
@@ -0,0 +1,40 @@
+/* libguestfs - the guestfsd daemon
+ * Copyright (C) 2009 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "daemon.h"
+#include "actions.h"
+
+int
+do_modprobe (const char *module)
+{
+  char *err;
+  int r = command (NULL, &err, "/sbin/modprobe", module, NULL);
+
+  if (r == -1) {
+    reply_with_error ("%s", err);
+  }
+
+  free (err);
+
+  return r;
+}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 33bf6e6..19eef99 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -30,6 +30,7 @@ daemon/ls.c
 daemon/lvm.c
 daemon/mkfs.c
 daemon/mknod.c
+daemon/modprobe.c
 daemon/mount.c
 daemon/names.c
 daemon/ntfs.c
diff --git a/src/MAX_PROC_NR b/src/MAX_PROC_NR
index 2455a46..205a12b 100644
--- a/src/MAX_PROC_NR
+++ b/src/MAX_PROC_NR
@@ -1 +1 @@
-193
+194
diff --git a/src/generator.ml b/src/generator.ml
index cc97dd5..18504d5 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -3560,6 +3560,15 @@ an external journal on the journal with UUID
C<uuid>.
 
 See also C<guestfs_mke2journal_U>.");
 
+  ("modprobe", (RErr, [String "module"]), 194, [],
+   [InitNone, Always, TestRun [["modprobe"; "ext2"]]],
+   "load a kernel module",
+   "\
+This loads a kernel module in the appliance.
+
+The kernel module must have been whitelisted when libguestfs
+was built (see C<appliance/kmod.whitelist.in> in the source).");
+
 ]
 
 let all_functions = non_daemon_functions @ daemon_functions
-- 
1.6.2.5