aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorloli10K <[email protected]>2019-09-04 22:36:25 +0200
committerBrian Behlendorf <[email protected]>2019-09-04 13:36:25 -0700
commitd02186ee2b0570069cfbb0d08d5c52752648f388 (patch)
treef6b31f94a82e160fdb8d6bffa4d6a0a6b528029c
parenta49dbbbe06c6c0d0c401530c756c0c056d49fbb7 (diff)
Fix zpool subcommands error message with some unsupported options
Both 'detach' and 'online' zpool subcommands, when provided with an unsupported option, forget to print it in the error message: # zpool online -t rpool vda3 invalid option '' usage: online [-e] <pool> <device> ... This changes fixes the error message in order to include the actual option that is not supported. Reviewed-by: Ryan Moeller <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: loli10K <[email protected]> Closes #9270
-rw-r--r--cmd/zpool/zpool_main.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
index a3c76030d..b9c7462b6 100644
--- a/cmd/zpool/zpool_main.c
+++ b/cmd/zpool/zpool_main.c
@@ -6111,9 +6111,8 @@ zpool_do_detach(int argc, char **argv)
int ret;
/* check options */
- while ((c = getopt(argc, argv, "f")) != -1) {
+ while ((c = getopt(argc, argv, "")) != -1) {
switch (c) {
- case 'f':
case '?':
(void) fprintf(stderr, gettext("invalid option '%c'\n"),
optopt);
@@ -6342,12 +6341,11 @@ zpool_do_online(int argc, char **argv)
int flags = 0;
/* check options */
- while ((c = getopt(argc, argv, "et")) != -1) {
+ while ((c = getopt(argc, argv, "e")) != -1) {
switch (c) {
case 'e':
flags |= ZFS_ONLINE_EXPAND;
break;
- case 't':
case '?':
(void) fprintf(stderr, gettext("invalid option '%c'\n"),
optopt);