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

diff --git a/daemon/grub.c b/daemon/grub.c
index 8a38d0b..86e812e 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 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
@@ -26,9 +26,9 @@
 #include "actions.h"
 
 int
-do_grub_install (const char *root, const char *device)
+do_grub_install (char *root, char *device)
 {
-  int r, len;
+  int r;
   char *err;
   char *buf;
 
@@ -36,13 +36,10 @@ do_grub_install (const char *root, const char *device)
   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);
   free (buf);