summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Booth <mbooth@redhat.com>2009-08-18 15:06:20 +0100
committerMatthew Booth <mbooth@redhat.com>2009-08-18 15:19:55 +0100
commit53ce488f380e3dd94c26bf507c5639975125a1ee (patch)
tree08f6502a592dc875a8a35afa063ef0a59699b3f4
parent7b65b7d323b1933cc1137e677d0e5c33d8bc7ff2 (diff)
downloadlibguestfs-53ce488f380e3dd94c26bf507c5639975125a1ee.tar.gz
libguestfs-53ce488f380e3dd94c26bf507c5639975125a1ee.tar.xz
libguestfs-53ce488f380e3dd94c26bf507c5639975125a1ee.zip
New 'modprobe' command.
Allow kernel modules to be loaded into the appliance.
-rw-r--r--daemon/Makefile.am1
-rw-r--r--daemon/modprobe.c40
-rw-r--r--po/POTFILES.in1
-rw-r--r--src/MAX_PROC_NR2
-rwxr-xr-xsrc/generator.ml9
5 files changed, 52 insertions, 1 deletions
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 097d89d8..83ee408c 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 00000000..7e3d1b70
--- /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 33bf6e67..19eef999 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 2455a46a..205a12b5 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 cc97dd5a..18504d55 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