* src/generator.ml: Change all `String "device"' to `Device "device"'.

[libguestfs.git] / daemon / grub.c

diff --git a/daemon/grub.c b/daemon/grub.c
index 85a5ab9..0a49c45 100644 (file)
--- 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
@@ -28,21 +28,17 @@
 int
 do_grub_install (char *root, char *device)
 {
-  int r, len;
+  int r;
   char *err;
   char *buf;
 
   NEED_ROOT (-1);
-  ABS_PATH (root, -1);
-  IS_DEVICE (device, -1);
+  ABS_PATH (root, return -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);