diff options
author | avg <avg@FreeBSD.org> | 2012-05-13 09:27:08 +0000 |
---|---|---|
committer | avg <avg@FreeBSD.org> | 2012-05-13 09:27:08 +0000 |
commit | 05e1e5ec457aea2a34127496411fc85cf85e4a13 (patch) | |
tree | 09bce01e4f1756779108dc84026a6c636c69458c /tools | |
parent | dc189e8db7ab6e039ad5dfb50e75c0cc8f8ac9dc (diff) | |
download | FreeBSD-src-05e1e5ec457aea2a34127496411fc85cf85e4a13.zip FreeBSD-src-05e1e5ec457aea2a34127496411fc85cf85e4a13.tar.gz |
zfsboottest: update for the recent zfs boot code changes
MFC after: 1 month
Diffstat (limited to 'tools')
-rw-r--r-- | tools/tools/zfsboottest/zfsboottest.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/tools/tools/zfsboottest/zfsboottest.c b/tools/tools/zfsboottest/zfsboottest.c index 4b29f94..3058046 100644 --- a/tools/tools/zfsboottest/zfsboottest.c +++ b/tools/tools/zfsboottest/zfsboottest.c @@ -89,7 +89,11 @@ main(int argc, char** argv) char buf[512], hash[33]; MD5_CTX ctx; struct stat sb; + struct zfsmount zfsmnt; dnode_phys_t dn; +#if 0 + uint64_t rootobj; +#endif spa_t *spa; off_t off; ssize_t n; @@ -138,14 +142,28 @@ main(int argc, char** argv) exit(1); } - if (zfs_mount_pool(spa)) { - fprintf(stderr, "can't mount pool\n"); + if (zfs_spa_init(spa)) { + fprintf(stderr, "can't init pool\n"); exit(1); } +#if 0 + if (zfs_get_root(spa, &rootobj)) { + fprintf(stderr, "can't get root\n"); + exit(1); + } + + if (zfs_mount(spa, rootobj, &zfsmnt)) { +#else + if (zfs_mount(spa, 0, &zfsmnt)) { + fprintf(stderr, "can't mount\n"); + exit(1); + } +#endif + printf("\n"); for (++i, failures = 0; i < argc; i++) { - if (zfs_lookup(spa, argv[i], &dn)) { + if (zfs_lookup(&zfsmnt, argv[i], &dn)) { fprintf(stderr, "%s: can't lookup\n", argv[i]); failures++; continue; |