summaryrefslogtreecommitdiffstats
path: root/cli/src
diff options
context:
space:
mode:
Diffstat (limited to 'cli/src')
-rw-r--r--cli/src/cli-cmd-volume.c6
-rw-r--r--cli/src/cli.c7
-rw-r--r--cli/src/cli.h1
3 files changed, 11 insertions, 3 deletions
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
index f11fa21db96..f3b1828a0c7 100644
--- a/cli/src/cli-cmd-volume.c
+++ b/cli/src/cli-cmd-volume.c
@@ -395,7 +395,7 @@ cli_cmd_volume_create_cbk (struct cli_state *state, struct cli_cmd_word *word,
}
}
- if (state->mode & GLUSTER_MODE_SCRIPT) {
+ if (state->mode & GLUSTER_MODE_WIGNORE) {
ret = dict_set_int32 (options, "force", _gf_true);
if (ret) {
gf_log ("cli", GF_LOG_ERROR, "Failed to set force "
@@ -981,7 +981,7 @@ cli_cmd_volume_add_brick_cbk (struct cli_state *state,
}
}
- if (state->mode & GLUSTER_MODE_SCRIPT) {
+ if (state->mode & GLUSTER_MODE_WIGNORE) {
ret = dict_set_int32 (options, "force", _gf_true);
if (ret) {
gf_log ("cli", GF_LOG_ERROR, "Failed to set force "
@@ -1552,7 +1552,7 @@ cli_cmd_volume_replace_brick_cbk (struct cli_state *state,
goto out;
}
- if (state->mode & GLUSTER_MODE_SCRIPT) {
+ if (state->mode & GLUSTER_MODE_WIGNORE) {
ret = dict_set_int32 (options, "force", _gf_true);
if (ret) {
gf_log ("cli", GF_LOG_ERROR, "Failed to set force"
diff --git a/cli/src/cli.c b/cli/src/cli.c
index 67f1ad25793..a77200c6692 100644
--- a/cli/src/cli.c
+++ b/cli/src/cli.c
@@ -326,14 +326,21 @@ cli_opt_parse (char *opt, struct cli_state *state)
return 0;
}
+ if (strcmp (opt, "wignore") == 0) {
+ state->mode |= GLUSTER_MODE_WIGNORE;
+ return 0;
+ }
+
oarg = strtail (opt, "mode=");
if (oarg) {
if (strcmp (oarg, "script") == 0) {
state->mode |= GLUSTER_MODE_SCRIPT;
return 0;
}
+
if (strcmp (oarg, "interactive") == 0)
return 0;
+
return -1;
}
diff --git a/cli/src/cli.h b/cli/src/cli.h
index 1fe8ffff7fb..f5db29383c0 100644
--- a/cli/src/cli.h
+++ b/cli/src/cli.h
@@ -45,6 +45,7 @@ enum argp_option_keys {
#define GLUSTER_MODE_SCRIPT (1 << 0)
#define GLUSTER_MODE_ERR_FATAL (1 << 1)
#define GLUSTER_MODE_XML (1 << 2)
+#define GLUSTER_MODE_WIGNORE (1 << 3)
#define GLUSTERD_GET_QUOTA_AUX_MOUNT_PATH(abspath, volname, path) \