daemon: Remove GUESTFSD_EXT_CMD.

GUESTFSD_EXT_CMD was used by OpenSUSE to track which external commands
are run by the daemon and package those commands into the appliance.

It is no longer used by recent SUSE builds, so remove it.

Thanks: Pino Toscano, Olaf Hering.
This commit is contained in:
Richard W.M. Jones
2017-07-24 16:27:07 +01:00
parent 8d09d716aa
commit 381c8b68c4
57 changed files with 306 additions and 484 deletions

View File

@@ -32,8 +32,6 @@
#include "actions.h"
#include "optgroups.h"
GUESTFSD_EXT_CMD(str_ntfsclone, ntfsclone);
/* Read the error file. Returns a string that the caller must free. */
static char *
read_error_file (char *error_file)
@@ -83,7 +81,7 @@ do_ntfsclone_in (const char *device)
/* Construct the command. */
if (asprintf (&cmd, "%s -O %s --restore-image - 2> %s",
str_ntfsclone, device, error_file) == -1) {
"ntfsclone", device, error_file) == -1) {
err = errno;
r = cancel_receive ();
errno = err;
@@ -161,8 +159,7 @@ do_ntfsclone_out (const char *device,
}
/* Construct the ntfsclone command. */
if (asprintf (&cmd, "%s -o - --save-image%s%s%s%s%s %s",
str_ntfsclone,
if (asprintf (&cmd, "ntfsclone -o - --save-image%s%s%s%s%s %s",
(optargs_bitmask & GUESTFS_NTFSCLONE_OUT_METADATAONLY_BITMASK) && metadataonly ? " --metadata" : "",
(optargs_bitmask & GUESTFS_NTFSCLONE_OUT_RESCUE_BITMASK) && rescue ? " --rescue" : "",
(optargs_bitmask & GUESTFS_NTFSCLONE_OUT_IGNOREFSCHECK_BITMASK) && ignorefscheck ? " --ignore-fs-check" : "",