Deleted Added
full compact
zpool_main.c (240415) zpool_main.c (243014)
1/*
2 * CDDL HEADER START
3 *
4 * The contents of this file are subject to the terms of the
5 * Common Development and Distribution License (the "License").
6 * You may not use this file except in compliance with the License.
7 *
8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

--- 331 unchanged lines hidden (view full) ---

340 /* Iterate over all properties */
341 (void) zprop_iter(print_prop_cb, fp, B_FALSE, B_TRUE,
342 ZFS_TYPE_POOL);
343
344 (void) fprintf(fp, "\t%-15s ", "feature@...");
345 (void) fprintf(fp, "YES disabled | enabled | active\n");
346
347 (void) fprintf(fp, gettext("\nThe feature@ properties must be "
1/*
2 * CDDL HEADER START
3 *
4 * The contents of this file are subject to the terms of the
5 * Common Development and Distribution License (the "License").
6 * You may not use this file except in compliance with the License.
7 *
8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

--- 331 unchanged lines hidden (view full) ---

340 /* Iterate over all properties */
341 (void) zprop_iter(print_prop_cb, fp, B_FALSE, B_TRUE,
342 ZFS_TYPE_POOL);
343
344 (void) fprintf(fp, "\t%-15s ", "feature@...");
345 (void) fprintf(fp, "YES disabled | enabled | active\n");
346
347 (void) fprintf(fp, gettext("\nThe feature@ properties must be "
348 "appended with a feature name.\nSee zpool-features(5).\n"));
348 "appended with a feature name.\nSee zpool-features(7).\n"));
349 }
350
351 /*
352 * See comments at end of main().
353 */
354 if (getenv("ZFS_ABORT") != NULL) {
355 (void) printf("dumping core by request\n");
356 abort();

--- 3808 unchanged lines hidden (view full) ---

4165
4166 case ZPOOL_STATUS_FEAT_DISABLED:
4167 (void) printf(gettext("status: Some supported features are not "
4168 "enabled on the pool. The pool can\n\tstill be used, but "
4169 "some features are unavailable.\n"));
4170 (void) printf(gettext("action: Enable all features using "
4171 "'zpool upgrade'. Once this is done,\n\tthe pool may no "
4172 "longer be accessible by software that does not support\n\t"
349 }
350
351 /*
352 * See comments at end of main().
353 */
354 if (getenv("ZFS_ABORT") != NULL) {
355 (void) printf("dumping core by request\n");
356 abort();

--- 3808 unchanged lines hidden (view full) ---

4165
4166 case ZPOOL_STATUS_FEAT_DISABLED:
4167 (void) printf(gettext("status: Some supported features are not "
4168 "enabled on the pool. The pool can\n\tstill be used, but "
4169 "some features are unavailable.\n"));
4170 (void) printf(gettext("action: Enable all features using "
4171 "'zpool upgrade'. Once this is done,\n\tthe pool may no "
4172 "longer be accessible by software that does not support\n\t"
4173 "the features. See zpool-features(5) for details.\n"));
4173 "the features. See zpool-features(7) for details.\n"));
4174 break;
4175
4176 case ZPOOL_STATUS_UNSUP_FEAT_READ:
4177 (void) printf(gettext("status: The pool cannot be accessed on "
4178 "this system because it uses the\n\tfollowing feature(s) "
4179 "not supported on this system:\n"));
4180 zpool_print_unsup_feat(config);
4181 (void) printf("\n");

--- 443 unchanged lines hidden (view full) ---

4625 if (cbp->cb_first) {
4626 (void) printf(gettext("\nSome "
4627 "supported features are not "
4628 "enabled on the following pools. "
4629 "Once a\nfeature is enabled the "
4630 "pool may become incompatible with "
4631 "software\nthat does not support "
4632 "the feature. See "
4174 break;
4175
4176 case ZPOOL_STATUS_UNSUP_FEAT_READ:
4177 (void) printf(gettext("status: The pool cannot be accessed on "
4178 "this system because it uses the\n\tfollowing feature(s) "
4179 "not supported on this system:\n"));
4180 zpool_print_unsup_feat(config);
4181 (void) printf("\n");

--- 443 unchanged lines hidden (view full) ---

4625 if (cbp->cb_first) {
4626 (void) printf(gettext("\nSome "
4627 "supported features are not "
4628 "enabled on the following pools. "
4629 "Once a\nfeature is enabled the "
4630 "pool may become incompatible with "
4631 "software\nthat does not support "
4632 "the feature. See "
4633 "zpool-features(5) for "
4633 "zpool-features(7) for "
4634 "details.\n\n"));
4635 (void) printf(gettext("POOL "
4636 "FEATURE\n"));
4637 (void) printf(gettext("------"
4638 "---------\n"));
4639 cbp->cb_first = B_FALSE;
4640 }
4641

--- 675 unchanged lines hidden ---
4634 "details.\n\n"));
4635 (void) printf(gettext("POOL "
4636 "FEATURE\n"));
4637 (void) printf(gettext("------"
4638 "---------\n"));
4639 cbp->cb_first = B_FALSE;
4640 }
4641

--- 675 unchanged lines hidden ---