From bf35f00522676d6e456b19168908cfa890ae0782 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 15 Jul 2022 07:32:16 -0600
Subject: [PATCH] kboot: Enhance kboot_getdev to cope with NULLs

Fallback to currdev when NULL is passed in when 'rootdev' is NULL. Other
getdevs do this. Additional features are needed here still, though.

Sponsored by:		Netflix
---
 stand/kboot/main.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/stand/kboot/main.c b/stand/kboot/main.c
index 90b31a611476..3fab25132f15 100644
--- a/stand/kboot/main.c
+++ b/stand/kboot/main.c
@@ -212,11 +212,17 @@ kboot_get_kernel_machine_bits(void)
 int
 kboot_getdev(void **vdev, const char *devspec, const char **path)
 {
-	int i;
+	int i, rv;
 	const char *devpath, *filepath;
 	struct devsw *dv;
 	struct devdesc *desc;
 
+	if (devspec == NULL) {
+		rv = kboot_getdev(vdev, getenv("currdev"), NULL);
+		if (rv == 0 && path != NULL)
+			*path = devspec;
+		return (rv);
+	}
 	if (strchr(devspec, ':') != NULL) {
 		devpath = devspec;
 		filepath = strchr(devspec, ':') + 1;