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

diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
index b1b71ac..1e9b3b6 100644
--- a/cmd/zpool/zpool_main.c
+++ b/cmd/zpool/zpool_main.c
@@ -241,7 +241,7 @@ get_usage(zpool_help_t idx) {
 		    "\tupgrade -v\n"
 		    "\tupgrade [-V version] <-a | pool ...>\n"));
 	case HELP_EVENTS:
-		return (gettext("\tevents [-vfc]\n"));
+		return (gettext("\tevents [-vHfc]\n"));
 	case HELP_GET:
 		return (gettext("\tget <\"all\" | property[,...]> "
 		    "<pool> ...\n"));
@@ -4228,6 +4228,7 @@ zpool_do_history(int argc, char **argv)
 
 typedef struct ev_opts {
 	int verbose;
+	int scripted;
 	int follow;
 	int clear;
 } ev_opts_t;
@@ -4342,7 +4343,7 @@ zpool_do_events_nvprint(nvlist_t *nvl, int depth)
 			printf(gettext("(embedded nvlist)\n"));
 			(void) nvpair_value_nvlist(nvp, &cnv);
 			zpool_do_events_nvprint(cnv, depth + 8);
-			printf(gettext("%*s(end %s)\n"), depth, "", name);
+			printf(gettext("%*s(end %s)"), depth, "", name);
 			break;
 
 		case DATA_TYPE_NVLIST_ARRAY: {
@@ -4472,7 +4473,8 @@ zpool_do_events_next(ev_opts_t *opts)
         cleanup_fd = open(ZFS_DEV, O_RDWR);
         VERIFY(cleanup_fd >= 0);
 
-	(void) printf(gettext("%-30s %s\n"), "TIME", "CLASS");
+	if (!opts->scripted)
+		(void) printf(gettext("%-30s %s\n"), "TIME", "CLASS");
 
 	while (1) {
 		ret = zpool_events_next(g_zfs, &nvl, &dropped,
@@ -4523,11 +4525,14 @@ zpool_do_events(int argc, char **argv)
 	int c;
 
 	/* check options */
-	while ((c = getopt(argc, argv, "vfc")) != -1) {
+	while ((c = getopt(argc, argv, "vHfc")) != -1) {
 		switch (c) {
 		case 'v':
 			opts.verbose = 1;
 			break;
+		case 'H':
+			opts.scripted = 1;
+			break;
 		case 'f':
 			opts.follow = 1;
 			break;
@@ -4712,14 +4717,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 +4732,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);