[Midnightbsd-cvs] src [8204] trunk/sys/boot/zfs/zfs.c: zfs boot: choose a first pool if none is explicitly requested.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Sep 17 11:50:43 EDT 2016
Revision: 8204
http://svnweb.midnightbsd.org/src/?rev=8204
Author: laffer1
Date: 2016-09-17 11:50:43 -0400 (Sat, 17 Sep 2016)
Log Message:
-----------
zfs boot: choose a first pool if none is explicitly requested.
Modified Paths:
--------------
trunk/sys/boot/zfs/zfs.c
Modified: trunk/sys/boot/zfs/zfs.c
===================================================================
--- trunk/sys/boot/zfs/zfs.c 2016-09-17 15:50:09 UTC (rev 8203)
+++ trunk/sys/boot/zfs/zfs.c 2016-09-17 15:50:43 UTC (rev 8204)
@@ -429,7 +429,10 @@
dev = va_arg(args, struct zfs_devdesc *);
va_end(args);
- spa = spa_find_by_guid(dev->pool_guid);
+ if (dev->pool_guid == 0)
+ spa = STAILQ_FIRST(&zfs_pools);
+ else
+ spa = spa_find_by_guid(dev->pool_guid);
if (!spa)
return (ENXIO);
rv = zfs_spa_init(spa);
@@ -543,7 +546,10 @@
if (dev->d_type != DEVT_ZFS)
return (buf);
- spa = spa_find_by_guid(dev->pool_guid);
+ if (dev->pool_guid == 0)
+ spa = STAILQ_FIRST(&zfs_pools);
+ else
+ spa = spa_find_by_guid(dev->pool_guid);
if (spa == NULL) {
printf("ZFS: can't find pool by guid\n");
return (buf);
More information about the Midnightbsd-cvs
mailing list