From 325f13989b72bd3c4c8f799a029725cd894ceb7a Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Mon, 8 Nov 1999 11:44:51 +0000
Subject: [PATCH] Ignore leading 'r' in base of root device name.

---
 sys/kern/vfs_conf.c  | 2 ++
 sys/kern/vfs_mount.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c
index 973c8365ca3e..8932e41e8fd0 100644
--- a/sys/kern/vfs_conf.c
+++ b/sys/kern/vfs_conf.c
@@ -314,6 +314,8 @@ setrootbyname(char *name)
 	if (cp != NULL) {
 		name = cp + 1;
 	}
+	if (*name == 'r')
+		name++;
 	cp = name;
 	while (cp != '\0' && (*cp < '0' || *cp > '9'))
 		cp++;
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index 973c8365ca3e..8932e41e8fd0 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -314,6 +314,8 @@ setrootbyname(char *name)
 	if (cp != NULL) {
 		name = cp + 1;
 	}
+	if (*name == 'r')
+		name++;
 	cp = name;
 	while (cp != '\0' && (*cp < '0' || *cp > '9'))
 		cp++;