X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fgrub.c;h=657abbba0cbedfab766994e1ab26f306be621199;hp=85a5ab95f60b65be5129e3d6437278321b8bb14c;hb=e82d864e02f7ab36881c6cda2798bb76370ee6c7;hpb=56bef498f46ac3dd580f4bde3c8f3ed2fe688826

diff --git a/daemon/grub.c b/daemon/grub.c
index 85a5ab9..657abbb 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,23 +26,16 @@
 #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) + 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);