git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* 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
8a38d0b
..
0a49c45
100644
(file)
--- a/
daemon/grub.c
+++ b/
daemon/grub.c
@@
-1,5
+1,5
@@
/* libguestfs - the guestfsd daemon
/* 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
*
* 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,19
@@
#include "actions.h"
int
#include "actions.h"
int
-do_grub_install (c
onst char *root, const
char *device)
+do_grub_install (c
har *root,
char *device)
{
{
- int r
, len
;
+ int r;
char *err;
char *buf;
NEED_ROOT (-1);
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;
}
return -1;
}
- snprintf (buf, len, "--root-directory=/sysroot%s", root);
r = command (NULL, &err, "/sbin/grub-install", buf, device, NULL);
free (buf);
r = command (NULL, &err, "/sbin/grub-install", buf, device, NULL);
free (buf);