X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fgrub.c;h=c61f9df29ed6f6d59741bc5dd10665d1dd37cafe;hb=f3341222b37f91d7f7fcdafe30b107ea9da9ad02;hp=8a38d0ba553cf1e67ed5750eb83e1e59fc7113e8;hpb=b55bf8158f0b7f6b1760b7b3b5f7c1274a149127;p=libguestfs.git

diff --git a/daemon/grub.c b/daemon/grub.c
index 8a38d0b..c61f9df 100644
--- a/daemon/grub.c
+++ b/daemon/grub.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc. 
+ * Copyright (C) 2009-2011 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
@@ -24,31 +24,31 @@
 
 #include "daemon.h"
 #include "actions.h"
+#include "optgroups.h"
+
+int
+optgroup_grub_available (void)
+{
+  return prog_exists ("grub-install");
+}
 
 int
 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) + 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=/sysroot%s", 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;
   }