|
 |
3604df |
From bd9148d6e5fa3586a7971634f74ae1b53877924f Mon Sep 17 00:00:00 2001
|
|
|
3604df |
From: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
3604df |
Date: Tue, 8 Nov 2016 19:54:11 +0530
|
|
|
3604df |
Subject: [PATCH 165/206] nfs/cli : add warning message while enabling gluster
|
|
|
3604df |
nfs
|
|
|
3604df |
|
|
|
3604df |
>Change-Id: Ice70003f7295d2d8af9877e1ecf6f3c81422b30c
|
|
|
3604df |
>BUG: 1376693
|
|
|
3604df |
>Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
3604df |
>Reviewed-on: http://review.gluster.org/15805
|
|
|
3604df |
>Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
>Reviewed-by: soumya k <skoduri@redhat.com>
|
|
|
3604df |
>Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
|
|
|
3604df |
>(cherry picked from commit a35d63050ec7e745a66c1aef8e1c8eb42d7b67a1)
|
|
|
3604df |
|
|
|
3604df |
Change-Id: Ice70003f7295d2d8af9877e1ecf6f3c81422b30c
|
|
|
3604df |
BUG: 1376695
|
|
|
3604df |
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
3604df |
Reviewed-on: https://code.engineering.redhat.com/gerrit/90282
|
|
|
3604df |
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
3604df |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
---
|
|
|
3604df |
cli/src/cli-cmd-parser.c | 14 ++++++++++++++
|
|
|
3604df |
1 file changed, 14 insertions(+)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c
|
|
|
3604df |
index 04c8a22..7eed1a4 100644
|
|
|
3604df |
--- a/cli/src/cli-cmd-parser.c
|
|
|
3604df |
+++ b/cli/src/cli-cmd-parser.c
|
|
|
3604df |
@@ -1679,6 +1679,20 @@ cli_cmd_volume_set_parse (struct cli_state *state, const char **words,
|
|
|
3604df |
goto out;
|
|
|
3604df |
}
|
|
|
3604df |
}
|
|
|
3604df |
+ if ((!strcmp (key, "nfs.disable")) &&
|
|
|
3604df |
+ (!strcmp (value, "off"))) {
|
|
|
3604df |
+ question = "Gluster NFS is being deprecated in favor "
|
|
|
3604df |
+ "of NFS-Ganesha Enter \"yes\" to continue "
|
|
|
3604df |
+ "using Gluster NFS";
|
|
|
3604df |
+ answer = cli_cmd_get_confirmation (state, question);
|
|
|
3604df |
+ if (GF_ANSWER_NO == answer) {
|
|
|
3604df |
+ gf_log ("cli", GF_LOG_ERROR, "Operation "
|
|
|
3604df |
+ "cancelled, exiting");
|
|
|
3604df |
+ *op_errstr = gf_strdup ("Aborted by user.");
|
|
|
3604df |
+ ret = -1;
|
|
|
3604df |
+ goto out;
|
|
|
3604df |
+ }
|
|
|
3604df |
+ }
|
|
|
3604df |
}
|
|
|
3604df |
|
|
|
3604df |
ret = dict_set_int32 (dict, "count", wordcount-3);
|
|
|
3604df |
--
|
|
|
3604df |
2.9.3
|
|
|
3604df |
|