svn commit: r254035 - stable/9/tools/tools/zfsboottest
Andriy Gapon
avg at FreeBSD.org
Wed Aug 7 07:31:21 UTC 2013
Author: avg
Date: Wed Aug 7 07:31:21 2013
New Revision: 254035
URL: http://svnweb.freebsd.org/changeset/base/254035
Log:
MFC r253067: zfsboottest: sync with changes in zfs boot code
Modified:
stable/9/tools/tools/zfsboottest/zfsboottest.c
Directory Properties:
stable/9/tools/tools/zfsboottest/ (props changed)
Modified: stable/9/tools/tools/zfsboottest/zfsboottest.c
==============================================================================
--- stable/9/tools/tools/zfsboottest/zfsboottest.c Wed Aug 7 07:28:00 2013 (r254034)
+++ stable/9/tools/tools/zfsboottest/zfsboottest.c Wed Aug 7 07:31:21 2013 (r254035)
@@ -52,6 +52,7 @@ pager_output(const char *line)
#define ZFS_TEST
#define printf(...) fprintf(stderr, __VA_ARGS__)
+#include "libzfs.h"
#include "zfsimpl.c"
#undef printf
@@ -134,7 +135,6 @@ main(int argc, char** argv)
close(fd[i - 1]);
}
}
- spa_all_status();
spa = STAILQ_FIRST(&zfs_pools);
if (spa == NULL) {
@@ -147,7 +147,10 @@ main(int argc, char** argv)
exit(1);
}
+ spa_all_status();
+
#if 0
+ uint64_t rootobj;
if (zfs_get_root(spa, &rootobj)) {
fprintf(stderr, "can't get root\n");
exit(1);
@@ -158,8 +161,8 @@ main(int argc, char** argv)
if (zfs_mount(spa, 0, &zfsmnt)) {
fprintf(stderr, "can't mount\n");
exit(1);
- }
#endif
+ }
printf("\n");
for (++i, failures = 0; i < argc; i++) {
More information about the svn-src-stable-9
mailing list