inspect: Refuse to download software hive if it is huge.

[libguestfs.git] / daemon / grub.c

diff --git a/daemon/grub.c b/daemon/grub.c
index 3b1768f..f394eef 100644 (file)
--- a/daemon/grub.c
+++ b/daemon/grub.c
@@ -26,29 +26,22 @@
 #include "actions.h"
 
 int
-do_grub_install (char *root, char *device)
+do_grub_install (const char *root, const char *device)
 {
-  int r, len;
+  int r;
   char *err;
   char *buf;
 
-  NEED_ROOT (-1);
-  ABS_PATH (root, -1);
-  IS_DEVICE (device, -1);
-
-  len = strlen (root) + sysroot_len + 64;
-  buf = malloc (len);
-  if (!buf) {
-    reply_with_perror ("malloc");
+  if (asprintf_nowarn (&buf, "--root-directory=%R", root) == -1) {
+    reply_with_perror ("asprintf");
     return -1;
   }
-  snprintf (buf, len, "--root-directory=%s%s", sysroot, root);
 
-  r = command (NULL, &err, "/sbin/grub-install", buf, device, NULL);
+  r = command (NULL, &err, "grub-install", buf, device, NULL);
   free (buf);
 
   if (r == -1) {
-    reply_with_error ("grub-install: %s", err);
+    reply_with_error ("%s", err);
     free (err);
     return -1;
   }