From 894da4775e10b7bfe678c3d43da430aae833f247 Mon Sep 17 00:00:00 2001
From: todd <todd@openbsd.org>
Date: Mon, 21 Jul 2008 04:35:53 +0000
Subject: [PATCH] nam2blk[] needs a "vnd" entry for some things (like softraid)
 ok marco@ no objection miod@ need this for regress djm@ no objection krw@

---
 sys/arch/alpha/alpha/autoconf.c     | 3 ++-
 sys/arch/amd64/amd64/autoconf.c     | 3 ++-
 sys/arch/armish/armish/autoconf.c   | 3 ++-
 sys/arch/aviion/aviion/autoconf.c   | 3 ++-
 sys/arch/hp300/hp300/autoconf.c     | 3 ++-
 sys/arch/hppa/hppa/autoconf.c       | 3 ++-
 sys/arch/hppa64/hppa64/autoconf.c   | 3 ++-
 sys/arch/i386/i386/autoconf.c       | 3 ++-
 sys/arch/landisk/landisk/autoconf.c | 3 ++-
 sys/arch/luna88k/luna88k/autoconf.c | 3 ++-
 sys/arch/mac68k/mac68k/autoconf.c   | 3 ++-
 sys/arch/macppc/macppc/autoconf.c   | 5 +++--
 sys/arch/mvme68k/mvme68k/autoconf.c | 3 ++-
 sys/arch/mvme88k/mvme88k/autoconf.c | 3 ++-
 sys/arch/mvmeppc/mvmeppc/autoconf.c | 5 +++--
 sys/arch/sgi/sgi/autoconf.c         | 3 ++-
 sys/arch/socppc/socppc/autoconf.c   | 3 ++-
 sys/arch/sparc/sparc/autoconf.c     | 3 ++-
 sys/arch/sparc64/sparc64/autoconf.c | 3 ++-
 sys/arch/vax/vax/autoconf.c         | 3 ++-
 sys/arch/zaurus/zaurus/autoconf.c   | 3 ++-
 21 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/sys/arch/alpha/alpha/autoconf.c b/sys/arch/alpha/alpha/autoconf.c
index 112f8aa12a3..22dcba852d5 100644
--- a/sys/arch/alpha/alpha/autoconf.c
+++ b/sys/arch/alpha/alpha/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.31 2007/06/01 19:25:09 deraadt Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.32 2008/07/21 04:35:53 todd Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.16 1996/11/13 21:13:04 cgd Exp $	*/
 
 /*
@@ -218,5 +218,6 @@ struct nam2blk nam2blk[] = {
 	{ "sd",		8 },
 	{ "wd",		0 },
 	{ "raid",	16 },
+	{ "vnd",	9 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/amd64/amd64/autoconf.c b/sys/arch/amd64/amd64/autoconf.c
index eba2b24baac..daad67636e0 100644
--- a/sys/arch/amd64/amd64/autoconf.c
+++ b/sys/arch/amd64/amd64/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.27 2008/05/26 22:49:58 deraadt Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.28 2008/07/21 04:35:54 todd Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $	*/
 
 /*-
@@ -188,5 +188,6 @@ struct nam2blk nam2blk[] = {
 	{ "sd",		4 },
 	{ "rd",		17 },
 	{ "raid",	19 },
+	{ "vnd",	14 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/armish/armish/autoconf.c b/sys/arch/armish/armish/autoconf.c
index c6ac0c495ba..780622bc4b4 100644
--- a/sys/arch/armish/armish/autoconf.c
+++ b/sys/arch/armish/armish/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.9 2007/06/01 19:25:09 deraadt Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.10 2008/07/21 04:35:54 todd Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.2 2001/09/05 16:17:36 matt Exp $	*/
 
 /*
@@ -147,5 +147,6 @@ struct nam2blk nam2blk[] = {
 	{ "cd",		26 },
 	{ "rd",		18 },
 	{ "raid",	71 },
+	{ "vnd",	19 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/aviion/aviion/autoconf.c b/sys/arch/aviion/aviion/autoconf.c
index 209e60a1656..1b0b7619009 100644
--- a/sys/arch/aviion/aviion/autoconf.c
+++ b/sys/arch/aviion/aviion/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.7 2007/12/12 20:36:40 miod Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.8 2008/07/21 04:35:54 todd Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -200,5 +200,6 @@ struct nam2blk nam2blk[] = {
 	{ "sd",		4 },
 	{ "cd", 	6 },
 	{ "rd",		7 },
+	{ "vnd",	8 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/hp300/hp300/autoconf.c b/sys/arch/hp300/hp300/autoconf.c
index 6efcee9abcf..4a88e4546e2 100644
--- a/sys/arch/hp300/hp300/autoconf.c
+++ b/sys/arch/hp300/hp300/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.44 2007/09/08 09:28:49 martin Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.45 2008/07/21 04:35:54 todd Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.45 1999/04/10 17:31:02 kleink Exp $	*/
 
 /*
@@ -870,5 +870,6 @@ struct nam2blk nam2blk[] = {
 	{ "st",		7 },
 	{ "rd",		8 },
 	{ "cd",		9 },
+	{ "vnd",	6 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/hppa/hppa/autoconf.c b/sys/arch/hppa/hppa/autoconf.c
index dbc172fe10d..15551aab5fd 100644
--- a/sys/arch/hppa/hppa/autoconf.c
+++ b/sys/arch/hppa/hppa/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.52 2008/04/20 18:01:33 kettenis Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.53 2008/07/21 04:35:54 todd Exp $	*/
 
 /*
  * Copyright (c) 1998-2003 Michael Shalayeff
@@ -480,5 +480,6 @@ struct nam2blk nam2blk[] = {
 	{ "cd",		6 },
 	{ "fd",		7 },
 	{ "wd",		8 },
+	{ "vnd",	2 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/hppa64/hppa64/autoconf.c b/sys/arch/hppa64/hppa64/autoconf.c
index 0b501b7bec3..46deed5fdb4 100644
--- a/sys/arch/hppa64/hppa64/autoconf.c
+++ b/sys/arch/hppa64/hppa64/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.10 2008/04/20 18:05:25 kettenis Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.11 2008/07/21 04:35:54 todd Exp $	*/
 
 /*
  * Copyright (c) 1998-2005 Michael Shalayeff
@@ -541,5 +541,6 @@ struct nam2blk nam2blk[] = {
 	{ "wd",		? },
 	{ "fd",		7 },
 #endif
+	{ "vnd",	2 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c
index ddac2feadde..67d5e0161ed 100644
--- a/sys/arch/i386/i386/autoconf.c
+++ b/sys/arch/i386/i386/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.80 2008/05/26 22:49:57 deraadt Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.81 2008/07/21 04:35:54 todd Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $	*/
 
 /*-
@@ -228,5 +228,6 @@ struct nam2blk nam2blk[] = {
 	{ "mcd",	7 },
 	{ "rd",		17 },
 	{ "raid",	19 },
+	{ "vnd",	14 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/landisk/landisk/autoconf.c b/sys/arch/landisk/landisk/autoconf.c
index 8860e46c8d3..1448b868ee8 100644
--- a/sys/arch/landisk/landisk/autoconf.c
+++ b/sys/arch/landisk/landisk/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.10 2008/06/26 05:42:11 ray Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.11 2008/07/21 04:35:54 todd Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.1 2006/09/01 21:26:18 uwe Exp $	*/
 
 /*-
@@ -77,5 +77,6 @@ struct nam2blk nam2blk[] = {
 	{ "wd",		16 },
 	{ "rd",		18 },
 	{ "sd",		24 },
+	{ "vnd",	19 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/luna88k/luna88k/autoconf.c b/sys/arch/luna88k/luna88k/autoconf.c
index c6d51585709..9a9feadf90e 100644
--- a/sys/arch/luna88k/luna88k/autoconf.c
+++ b/sys/arch/luna88k/luna88k/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.13 2007/10/13 12:55:21 miod Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.14 2008/07/21 04:35:54 todd Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -171,5 +171,6 @@ struct nam2blk nam2blk[] = {
 	{ "sd",		4 },
 	{ "st",		5 },
 	{ "rd",		7 },
+	{ "vnd",	8 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/mac68k/mac68k/autoconf.c b/sys/arch/mac68k/mac68k/autoconf.c
index ff73393f931..ae2c49e962c 100644
--- a/sys/arch/mac68k/mac68k/autoconf.c
+++ b/sys/arch/mac68k/mac68k/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.30 2007/06/01 19:25:10 deraadt Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.31 2008/07/21 04:35:54 todd Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.38 1996/12/18 05:46:09 scottr Exp $	*/
 
 /*
@@ -186,5 +186,6 @@ struct nam2blk nam2blk[] = {
 	{ "sd",         4 },
 	{ "cd",         6 },
 	{ "rd",		13 },
+	{ "vnd",	8 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/macppc/macppc/autoconf.c b/sys/arch/macppc/macppc/autoconf.c
index 8a2bddf9d9e..1ba43268ae9 100644
--- a/sys/arch/macppc/macppc/autoconf.c
+++ b/sys/arch/macppc/macppc/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.35 2008/03/30 22:19:33 deraadt Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.36 2008/07/21 04:35:54 todd Exp $	*/
 /*
  * Copyright (c) 1996, 1997 Per Fogelstrom
  * Copyright (c) 1995 Theo de Raadt
@@ -37,7 +37,7 @@
  * from: Utah Hdr: autoconf.c 1.31 91/01/21
  *
  *	from: @(#)autoconf.c	8.1 (Berkeley) 6/10/93
- *      $Id: autoconf.c,v 1.35 2008/03/30 22:19:33 deraadt Exp $
+ *      $Id: autoconf.c,v 1.36 2008/07/21 04:35:54 todd Exp $
  */
 
 /*
@@ -291,5 +291,6 @@ struct nam2blk nam2blk[] = {
 	{ "sd",		2 },
 	{ "rd",		17 },
 	{ "raid",	19 },
+	{ "vnd",	14 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/mvme68k/mvme68k/autoconf.c b/sys/arch/mvme68k/mvme68k/autoconf.c
index 4b5122a29b8..04735425bd9 100644
--- a/sys/arch/mvme68k/mvme68k/autoconf.c
+++ b/sys/arch/mvme68k/mvme68k/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.41 2007/11/02 19:18:54 martin Exp $ */
+/*	$OpenBSD: autoconf.c,v 1.42 2008/07/21 04:35:54 todd Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -321,5 +321,6 @@ struct nam2blk nam2blk[] = {
 	{ "sd",		4 },
 	{ "st",		7 },
 	{ "rd",		9 },
+	{ "vnd",	6 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/mvme88k/mvme88k/autoconf.c b/sys/arch/mvme88k/mvme88k/autoconf.c
index 6d737a3e65c..7a15b613705 100644
--- a/sys/arch/mvme88k/mvme88k/autoconf.c
+++ b/sys/arch/mvme88k/mvme88k/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.41 2007/10/28 19:48:47 miod Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.42 2008/07/21 04:35:54 todd Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -202,5 +202,6 @@ struct nam2blk nam2blk[] = {
 	{ "sd",		4 },
 	{ "cd",		6 },
 	{ "rd",		7 },
+	{ "vnd",	8 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/mvmeppc/mvmeppc/autoconf.c b/sys/arch/mvmeppc/mvmeppc/autoconf.c
index c39f176080e..495579de7a6 100644
--- a/sys/arch/mvmeppc/mvmeppc/autoconf.c
+++ b/sys/arch/mvmeppc/mvmeppc/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.21 2008/03/30 22:29:09 deraadt Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.22 2008/07/21 04:35:54 todd Exp $	*/
 /*
  * Copyright (c) 1996, 1997 Per Fogelstrom
  * Copyright (c) 1995 Theo de Raadt
@@ -37,7 +37,7 @@
  * from: Utah Hdr: autoconf.c 1.31 91/01/21
  *
  *	from: @(#)autoconf.c	8.1 (Berkeley) 6/10/93
- *      $Id: autoconf.c,v 1.21 2008/03/30 22:29:09 deraadt Exp $
+ *      $Id: autoconf.c,v 1.22 2008/07/21 04:35:54 todd Exp $
  */
 
 /*
@@ -180,5 +180,6 @@ struct nam2blk nam2blk[] = {
 	{ "sd",		2 },
 	{ "rd",		17 },
 	{ "raid",	19 },
+	{ "vnd",	14 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/sgi/sgi/autoconf.c b/sys/arch/sgi/sgi/autoconf.c
index 180bbb147ab..b2ada3e0ebe 100644
--- a/sys/arch/sgi/sgi/autoconf.c
+++ b/sys/arch/sgi/sgi/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.17 2008/03/30 22:19:33 deraadt Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.18 2008/07/21 04:35:54 todd Exp $	*/
 /*
  * Copyright (c) 1996 Per Fogelstrom
  * Copyright (c) 1995 Theo de Raadt
@@ -275,5 +275,6 @@ struct nam2blk nam2blk[] = {
 	{ "sd",		0 },
 	{ "wd",		4 },
 	{ "rd",		8 },
+	{ "vnd",	2 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/socppc/socppc/autoconf.c b/sys/arch/socppc/socppc/autoconf.c
index 4bc29f7a00a..e1fdcc53264 100644
--- a/sys/arch/socppc/socppc/autoconf.c
+++ b/sys/arch/socppc/socppc/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.2 2008/05/14 22:34:14 kettenis Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.3 2008/07/21 04:35:54 todd Exp $	*/
 
 /*
  * Copyright (c) 2008 Mark Kettenis
@@ -72,5 +72,6 @@ struct nam2blk nam2blk[] = {
 	{ "sd",		2 },
 	{ "rd",		17 },
 	{ "raid",	19 },
+	{ "vnd",	14 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c
index dfcf8622fcc..b8b1937e456 100644
--- a/sys/arch/sparc/sparc/autoconf.c
+++ b/sys/arch/sparc/sparc/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.81 2008/03/23 17:05:41 deraadt Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.82 2008/07/21 04:35:54 todd Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.73 1997/07/29 09:41:53 fair Exp $ */
 
 /*
@@ -1840,5 +1840,6 @@ struct nam2blk nam2blk[] = {
 	{ "rd",		17 },
 	{ "cd",		18 },
 	{ "raid",	25 },
+	{ "vnd",	8 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c
index 01900449b7b..6a19045ee7d 100644
--- a/sys/arch/sparc64/sparc64/autoconf.c
+++ b/sys/arch/sparc64/sparc64/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.96 2008/07/06 08:53:38 kettenis Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.97 2008/07/21 04:35:54 todd Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */
 
 /*
@@ -1354,5 +1354,6 @@ struct nam2blk nam2blk[] = {
 	{ "wd",		12 },
 	{ "cd",		18 },
 	{ "raid",	25 },
+	{ "vnd",	8 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/vax/vax/autoconf.c b/sys/arch/vax/vax/autoconf.c
index 0d0e43da7ea..ca7153c4732 100644
--- a/sys/arch/vax/vax/autoconf.c
+++ b/sys/arch/vax/vax/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.29 2007/06/01 19:25:10 deraadt Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.30 2008/07/21 04:35:54 todd Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.45 1999/10/23 14:56:05 ragge Exp $	*/
 
 /*
@@ -467,5 +467,6 @@ struct nam2blk nam2blk[] = {
 	{ "cd",         22 },
 	{ "rd",         23 },
 	{ "raid",       25 },
+	{ "vnd",	18 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/zaurus/zaurus/autoconf.c b/sys/arch/zaurus/zaurus/autoconf.c
index 257f0b105ed..e99f8ff0167 100644
--- a/sys/arch/zaurus/zaurus/autoconf.c
+++ b/sys/arch/zaurus/zaurus/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.12 2007/06/01 19:25:10 deraadt Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.13 2008/07/21 04:35:54 todd Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.2 2001/09/05 16:17:36 matt Exp $	*/
 
 /*
@@ -145,5 +145,6 @@ struct nam2blk nam2blk[] = {
 	{ "cd",		26 },
 	{ "rd",		18 },
 	{ "raid",	71 },
+	{ "vnd",	19 },
 	{ NULL,		-1 }
 };
-- 
2.20.1