* file named AUTHORS, in the root directory of this distribution.
*/
/*
- * $Id: sendbackup-dump.c,v 1.90 2006/07/25 18:10:07 martinea Exp $
+ * $Id: sendbackup-dump.c,v 1.90.2.2 2006/11/24 18:10:38 martinea Exp $
*
* send backup data using BSD dump
*/
char *device = NULL;
char *fstype = NULL;
char *cmd = NULL;
+ char *cmdX = NULL;
char *indexcmd = NULL;
char level_str[NUM_STR_SIZE];
char *compopt = NULL;
#if defined(USE_RUNDUMP) || !defined(DUMP)
cmd = vstralloc(libexecdir, "/", "rundump", versionsuffix(), NULL);
+ cmdX = cmd;
if (g_options->config)
config = g_options->config;
else
config = "NOCONFIG";
#else
cmd = stralloc(DUMP);
+ cmdX = skip_argument;
config = skip_argument;
#endif
{
char *progname = cmd = newvstralloc(cmd, libexecdir, "/", "rundump",
versionsuffix(), NULL);
+ cmdX = cmd;
if (g_options->config)
config = g_options->config;
else
dumpkeys = stralloc(level_str);
dumppid = pipespawn(progname, STDIN_PIPE,
&dumpin, &dumpout, &mesgf,
- config, /* JLM */
+ cmdX, config,
"xfsdump",
options->no_record ? "-J" : skip_argument,
"-F",
#ifdef USE_RUNDUMP
char *progname = cmd = newvstralloc(cmd, libexecdir, "/", "rundump",
versionsuffix(), NULL);
+ cmdX = cmd;
if (g_options->config)
config = g_options->config;
else
config = "NOCONFIG";
#else
char *progname = cmd = newvstralloc(cmd, VXDUMP, NULL);
+ cmdX = skip_argument;
config = skip_argument;
#endif
program->backup_name = VXDUMP;
dumppid = pipespawn(progname, STDIN_PIPE,
&dumpin, &dumpout, &mesgf,
- progname, config, /* JLM */
+ cmdX, config,
"vxdump",
dumpkeys,
"1048576",
{
char *progname = cmd = newvstralloc(cmd, libexecdir, "/", "rundump",
versionsuffix(), NULL);
+ cmdX = cmd;
if (g_options->config)
config = g_options->config;
else
dumppid = pipespawn(cmd, STDIN_PIPE,
&dumpin, &dumpout, &mesgf,
- cmd, config,
+ cmdX, config,
"vdump",
dumpkeys,
"60",
#define RESTORE "restore"
#endif
+#ifdef HAVE_HONOR_NODUMP
+# define PARAM_HONOR_NODUMP "h"
+#else
+# define PARAM_HONOR_NODUMP ""
+#endif
dumpkeys = vstralloc(level_str,
options->no_record ? "" : "u",
"s",
-#ifdef HAVE_HONOR_NODUMP
- "h",
-#endif
+ PARAM_HONOR_NODUMP,
"f",
NULL);
dumppid = pipespawn(cmd, STDIN_PIPE,
&dumpin, &dumpout, &mesgf,
- cmd, config,
+ cmdX, config,
"dump",
dumpkeys,
"1048576",
dumppid = pipespawn(cmd, STDIN_PIPE,
&dumpin, &dumpout, &mesgf,
- cmd, config,
+ cmdX, config,
"backup",
dumpkeys,
"-",