Add grub-install command.

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index c2c4a11..ecced37 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -31,6 +31,7 @@ guestfsd_SOURCES = \
        ext2.c \
        file.c \
        fsck.c \
+       grub.c \
        guestfsd.c \
        ls.c \
        lvm.c \

diff --git a/daemon/grub.c b/daemon/grub.c
new file mode 100644 (file)
index 0000000..8a38d0b
--- /dev/null
+++ b/daemon/grub.c
@@ -0,0 +1,58 @@
+/* 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 <string.h>
+
+#include "daemon.h"
+#include "actions.h"
+
+int
+do_grub_install (const char *root, const char *device)
+{
+  int r, len;
+  char *err;
+  char *buf;
+
+  NEED_ROOT (-1);
+  ABS_PATH (root, -1);
+  IS_DEVICE (device, -1);
+
+  len = strlen (root) + 64;
+  buf = malloc (len);
+  if (!buf) {
+    reply_with_perror ("malloc");
+    return -1;
+  }
+  snprintf (buf, len, "--root-directory=/sysroot%s", root);
+
+  r = command (NULL, &err, "/sbin/grub-install", buf, device, NULL);
+  free (buf);
+
+  if (r == -1) {
+    reply_with_error ("grub-install: %s", err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+  return 0;
+}

diff --git a/make-initramfs.sh.in b/make-initramfs.sh.in
index f641cd0..2e3befb 100755 (executable)
--- a/make-initramfs.sh.in
+++ b/make-initramfs.sh.in
@@ -26,7 +26,9 @@ modules="
 -i augeas-libs
 -i bash
 -i coreutils
+-i dosfstools
 -i file
+-i grub
 -i iputils
 -i kernel
 -i lvm2
@@ -34,11 +36,10 @@ modules="
 -i module-init-tools
 -i net-tools
 -i ntfs-3g
+-i ntfsprogs
 -i procps
 -i strace
 -i util-linux-ng
--i dosfstools
--i ntfsprogs
 "
 
 # Decide on names for the final output.  These have to match Makefile.am.

diff --git a/src/generator.ml b/src/generator.ml
index 04445ee..ba97deb 100755 (executable)
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -1683,6 +1683,15 @@ How many blocks are zeroed isn't specified (but it's I<not> enough
 to securely wipe the device).  It should be sufficient to remove
 any partition tables, filesystem superblocks and so on.");
 
+  ("grub_install", (RErr, [String "root"; String "device"]), 86, [],
+   [InitBasicFS, TestOutputTrue (
+      [["grub_install"; "/"; "/dev/sda1"];
+       ["is_dir"; "/boot"]])],
+   "install GRUB",
+   "\
+This command installs GRUB (the Grand Unified Bootloader) on
+C<device>, with the root directory being C<root>.");
+
 
 ]