Add a GPT-aware variant of zfsboot which should be used in a similar manner

to gptboot, i.e. installed in a freebsd-boot partition using /sbin/gpart or
/sbin/gpt.

Tweak the /boot/loader ZFS support so that it can find ZFS pools that are
contained in GPT partitions.

1 files changed, 7 insertions, 3 deletions

diff --git a/sys/boot/zfs/zfs.c b/sys/boot/zfs/zfs.c
index cf0bb9c..e5cfad6 100644
--- a/sys/boot/zfs/zfs.c
+++ b/sys/boot/zfs/zfs.c
@@ -414,10 +414,14 @@ zfs_dev_init(void)
 			close(fd);
 
 		for (slice = 1; slice <= 4; slice++) {
-			sprintf(devname, "disk%ds%d:", unit, slice);
+			sprintf(devname, "disk%dp%d:", unit, slice);
 			fd = open(devname, O_RDONLY);
-			if (fd == -1)
-				continue;
+			if (fd == -1) {
+				sprintf(devname, "disk%ds%d:", unit, slice);
+				fd = open(devname, O_RDONLY);
+				if (fd == -1)
+					continue;
+			}
 			if (vdev_probe(vdev_read, (void*) (uintptr_t) fd, 0))
 				close(fd);
 		}