From 0a9f60927927b7a4228169d690ea8b1cfe5afd1c Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Sun, 27 May 2007 18:37:25 +0000
Subject: [PATCH] The proper root device for a vkernel fs is vkd0s0a, not
 vkd0a. Also fix kern/vfs_conf.c to properly interpret 's0'.

---
 sys/kern/vfs_conf.c                  | 9 +++------
 sys/platform/vkernel/platform/init.c | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c
index 54f6b12ba9..92be9a3623 100644
--- a/sys/kern/vfs_conf.c
+++ b/sys/kern/vfs_conf.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/kern/vfs_conf.c,v 1.49.2.5 2003/01/07 11:56:53 joerg Exp $
- *	$DragonFly: src/sys/kern/vfs_conf.c,v 1.30 2007/05/19 00:52:01 dillon Exp $
+ *	$DragonFly: src/sys/kern/vfs_conf.c,v 1.31 2007/05/27 18:37:23 dillon Exp $
  */
 
 /*
@@ -422,11 +422,8 @@ kgetdiskbyname(const char *name)
 	 */
 	if (*cp == 's') {
 		slice = cp[1] - '0';
-		if (slice < 1 || slice > 9) {
-			kprintf("bad slice number\n");
-			return(NULL);
-		}
-		++slice;	/* slice #1 starts at 2 */
+		if (slice >= 1)
+			++slice;
 		cp += 2;
 	} else {
 		slice = 0;
diff --git a/sys/platform/vkernel/platform/init.c b/sys/platform/vkernel/platform/init.c
index b5fe7c0a26..758fdae2a8 100644
--- a/sys/platform/vkernel/platform/init.c
+++ b/sys/platform/vkernel/platform/init.c
@@ -31,7 +31,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $DragonFly: src/sys/platform/vkernel/platform/init.c,v 1.36 2007/05/25 02:21:19 dillon Exp $
+ * $DragonFly: src/sys/platform/vkernel/platform/init.c,v 1.37 2007/05/27 18:37:25 dillon Exp $
  */
 
 #include <sys/types.h>
@@ -621,7 +621,7 @@ init_disk(char *diskExp[], int diskFileNum, enum vkdisk_type type)
 				if (type == VKD_CD)
 				    rootdevnames[0] = "cd9660:vcd0a";
 				else if (type == VKD_DISK)
-				    rootdevnames[0] = "ufs:vkd0a";
+				    rootdevnames[0] = "ufs:vkd0s0a";
 			}
 
 			DiskNum++;
-- 
2.11.4.GIT