mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon: add missing GUESTFSD_EXT_CMD usage

Browse Source 
Signed-off-by: Olaf Hering <olaf@aepfle.de>
This commit is contained in:
Olaf Hering
2014-01-19 20:22:49 +01:00
committed by Richard W.M. Jones
parent badc4ffad5
commit d87cfefcdd
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/btrfs.c
View File

@@ -597,7 +597,7 @@ test_btrfs_device_add_needs_force (void)
int r;
CLEANUP_FREE char *out = NULL, *err = NULL;
r = command (&out, &err, "btrfs", "device", "add", "--help", NULL);
r = command (&out, &err, str_btrfs, "device", "add", "--help", NULL);
if (r == -1) {
reply_with_error ("%s: %s", "btrfs device add --help", err);
return -1;

3
daemon/command.c
View File

@@ -30,6 +30,7 @@
#include "ignore-value.h"
GUESTFSD_EXT_CMD(str_cp, cp);
GUESTFSD_EXT_CMD(str_mount, mount);
GUESTFSD_EXT_CMD(str_umount, umount);
@@ -179,7 +180,7 @@ set_up_etc_resolv_conf (struct resolver_state *rs)
/* Now that the guest's <sysroot>/etc/resolv.conf is out the way, we
* can create our own copy of the appliance /etc/resolv.conf.
*/
ignore_value (command (NULL, NULL, "cp", "/etc/resolv.conf",
ignore_value (command (NULL, NULL, str_cp, "/etc/resolv.conf",
rs->sysroot_etc_resolv_conf, NULL));
rs->mounted = true;

3
daemon/debug.c
View File

@@ -41,6 +41,7 @@ GUESTFSD_EXT_CMD(str_xargs, xargs);
GUESTFSD_EXT_CMD(str_file, file);
GUESTFSD_EXT_CMD(str_grep, grep);
GUESTFSD_EXT_CMD(str_gawk, gawk);
GUESTFSD_EXT_CMD(str_sh, sh);
/* This command exposes debugging information, internals and
* status. There is no comprehensive documentation for this
@@ -335,7 +336,7 @@ debug_binaries (const char *subcmd, size_t argc, char *const *const argv)
"| %s -F: '{print $1}'",
str_find, str_xargs, str_file, str_grep, str_gawk);
r = command (&out, &err, "sh", "-c", cmd, NULL);
r = command (&out, &err, str_sh, "-c", cmd, NULL);
if (r == -1) {
reply_with_error ("find: %s", err);
free (out);

4
daemon/ldm.c
View File

@@ -130,7 +130,7 @@ do_ldmtool_create_all (void)
int r;
CLEANUP_FREE char *err = NULL;
r = command (NULL, &err, "ldmtool", "create", "all", NULL);
r = command (NULL, &err, str_ldmtool, "create", "all", NULL);
if (r == -1) {
reply_with_error ("%s", err);
return -1;
@@ -144,7 +144,7 @@ do_ldmtool_remove_all (void)
int r;
CLEANUP_FREE char *err = NULL;
r = command (NULL, &err, "ldmtool", "remove", "all", NULL);
r = command (NULL, &err, str_ldmtool, "remove", "all", NULL);
if (r == -1) {
reply_with_error ("%s", err);
return -1;