Author: avg
Date: Tue Jul 9 08:29:14 2013
New Revision: 253067
URL: http://svnweb.freebsd.org/changeset/base/253067
Log:
zfsboottest: sync with changes in zfs boot code
- spa status can not be called before spa init
- libzfs.h inclusion is now required
- fix alternative code for explicit root dataset lookup
MFC after: 10 days
Modified:
head/tools/tools/zfsboottest/zfsboottest.c
Modified: head/tools/tools/zfsboottest/zfsboottest.c
==============================================================================
--- head/tools/tools/zfsboottest/zfsboottest.c Tue Jul 9 08:23:43 2013
(r253066)
+++ head/tools/tools/zfsboottest/zfsboottest.c Tue Jul 9 08:29:14 2013
(r253067)
@@ -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++) {
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
