git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
df, testing: Add notes on virt-df numbers (thanks Kashyap Chamarthy).
[libguestfs.git]
/
daemon
/
grub.c
diff --git
a/daemon/grub.c
b/daemon/grub.c
index
86e812e
..
0617036
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
-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
*
* 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
@@
-13,7
+13,7
@@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc.,
675 Mass Ave, Cambridge, MA 02139,
USA.
+ * Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
*/
#include <config.h>
*/
#include <config.h>
@@
-24,28
+24,31
@@
#include "daemon.h"
#include "actions.h"
#include "daemon.h"
#include "actions.h"
+#include "optgroups.h"
int
int
-do_grub_install (char *root, char *device)
+optgroup_grub_available (void)
+{
+ return prog_exists ("grub-install");
+}
+
+int
+do_grub_install (const char *root, const char *device)
{
int r;
char *err;
char *buf;
{
int r;
char *err;
char *buf;
- NEED_ROOT (-1);
- ABS_PATH (root, -1);
- IS_DEVICE (device, -1);
-
if (asprintf_nowarn (&buf, "--root-directory=%R", root) == -1) {
reply_with_perror ("asprintf");
return -1;
}
if (asprintf_nowarn (&buf, "--root-directory=%R", root) == -1) {
reply_with_perror ("asprintf");
return -1;
}
- r = command (NULL, &err, "
/sbin/
grub-install", buf, device, NULL);
+ r = command (NULL, &err, "grub-install", buf, device, NULL);
free (buf);
if (r == -1) {
free (buf);
if (r == -1) {
- reply_with_error ("
grub-install:
%s", err);
+ reply_with_error ("%s", err);
free (err);
return -1;
}
free (err);
return -1;
}