X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fzpool%2Fzpool_main.c;h=3859bf737a382287f493ebdb5463b75acd89bb0a;hb=ac063c48ae12061bbe0f66b3a9d641239782ae62;hp=b1b71acf841efd4c8fb0c05952e39e77a23207ad;hpb=d603ed6c278f9c25b17ba8e75e9bce6e5d715ac0;p=zfs.git

diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
index b1b71ac..3859bf7 100644
--- a/cmd/zpool/zpool_main.c
+++ b/cmd/zpool/zpool_main.c
@@ -4712,14 +4712,6 @@ main(int argc, char **argv)
 	(void) setlocale(LC_ALL, "");
 	(void) textdomain(TEXT_DOMAIN);
 
-	if ((g_zfs = libzfs_init()) == NULL) {
-		(void) fprintf(stderr, gettext("internal error: failed to "
-		    "initialize ZFS library\n"));
-		return (1);
-	}
-
-	libzfs_print_on_error(g_zfs, B_TRUE);
-
 	opterr = 0;
 
 	/*
@@ -4735,9 +4727,15 @@ main(int argc, char **argv)
 	/*
 	 * Special case '-?'
 	 */
-	if (strcmp(cmdname, "-?") == 0)
+	if ((strcmp(cmdname, "-?") == 0) ||
+	     strcmp(cmdname, "--help") == 0)
 		usage(B_TRUE);
 
+	if ((g_zfs = libzfs_init()) == NULL)
+		return (1);
+
+	libzfs_print_on_error(g_zfs, B_TRUE);
+
 	zpool_set_history_str("zpool", argc, argv, history_str);
 	verify(zpool_stage_history(g_zfs, history_str) == 0);