From 6a324a98cb8ddd86486a404b54dce987d45251a8 Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Thu, 10 Apr 2003 17:05:25 +0000
Subject: [PATCH] * Add ADI_BRH to the list of kernel sets. * Add "ld" to the
 list of acceptable disk names.

---
 distrib/utils/sysinst/arch/evbarm/md.c        |  4 +-
 distrib/utils/sysinst/arch/evbarm/md.h        |  8 ++--
 distrib/utils/sysinst/arch/evbarm/menus.md.en | 37 ++++++++++---------
 distrib/utils/sysinst/arch/evbarm/menus.md.fr | 37 ++++++++++---------
 distrib/utils/sysinst/arch/evbarm/menus.md.pl | 37 ++++++++++---------
 5 files changed, 64 insertions(+), 59 deletions(-)

diff --git a/distrib/utils/sysinst/arch/evbarm/md.c b/distrib/utils/sysinst/arch/evbarm/md.c
index dc6f3c557048..e3735fd1ca53 100644
--- a/distrib/utils/sysinst/arch/evbarm/md.c
+++ b/distrib/utils/sysinst/arch/evbarm/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.4 2002/12/05 01:17:22 fvdl Exp $	*/
+/*	$NetBSD: md.c,v 1.5 2003/04/10 17:05:25 thorpej Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -362,10 +362,10 @@ void
 md_set_no_x()
 {
 
-	toggle_getit (11);
 	toggle_getit (12);
 	toggle_getit (13);
 	toggle_getit (14);
 	toggle_getit (15);
 	toggle_getit (16);
+	toggle_getit (17);
 }
diff --git a/distrib/utils/sysinst/arch/evbarm/md.h b/distrib/utils/sysinst/arch/evbarm/md.h
index ac47590f318f..29bef19ecc32 100644
--- a/distrib/utils/sysinst/arch/evbarm/md.h
+++ b/distrib/utils/sysinst/arch/evbarm/md.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.h,v 1.3 2003/04/06 16:12:39 jmmv Exp $	*/
+/*	$NetBSD: md.h,v 1.4 2003/04/10 17:05:25 thorpej Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -56,6 +56,7 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
+    {"kern-ADI_BRH",		0, "Kernel       : "},
     {"kern-INTEGRATOR",		0, "Kernel       : "},
     {"kern-IQ80310",		0, "Kernel       : "},
     {"kern-IQ80321",		0, "Kernel       : "},
@@ -82,11 +83,12 @@ EXTERN distinfo dist_list[]
 /*
  * Disk names accepted as valid targets for a from-scratch installation.
  *
- * On shark, we allow "wd" IDE disks and "sd" scsi disks.
+ * We allow "wd" (IDE disks), "sd" (SCSI disks), and "ld" (logical disks
+ * on RAID controllers).
  */
 EXTERN	char *disk_names[]
 #ifdef MAIN
-= {"wd", "sd", NULL}
+= {"wd", "sd", "ld", NULL}
 #endif
 ;
 
diff --git a/distrib/utils/sysinst/arch/evbarm/menus.md.en b/distrib/utils/sysinst/arch/evbarm/menus.md.en
index fee63cc83405..1f07ef1afb7d 100644
--- a/distrib/utils/sysinst/arch/evbarm/menus.md.en
+++ b/distrib/utils/sysinst/arch/evbarm/menus.md.en
@@ -1,4 +1,4 @@
-/*	$NetBSD: menus.md.en,v 1.2 2002/04/13 02:34:18 thorpej Exp $	*/
+/*	$NetBSD: menus.md.en,v 1.3 2003/04/10 17:05:25 thorpej Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -57,20 +57,21 @@ menu editfsparts, y=12, exit;
  
 menu md_distcustom, x=26, y=5, exit, title "Selection toggles inclusion";
 	display action { show_cur_distsets (); };
-	option	"Kernel (INTEGRATOR)",	 action { toggle_getit (0); };
-	option	"Kernel (IQ80310)",	 action { toggle_getit (1); };
-	option	"Kernel (IQ80321)",	 action { toggle_getit (2); };
-	option	"Kernel (TEAMASA_NPWR)", action { toggle_getit (3); };
-	option	"Base",			 action { toggle_getit (4); };
-	option	"System (/etc)",	 action { toggle_getit (5); };
-	option  "Compiler Tools", 	 action { toggle_getit (6); };
-	option  "Games", 		 action { toggle_getit (7); };
-	option  "Online Manual Pages", 	 action { toggle_getit (8); };
-	option  "Miscellaneous", 	 action { toggle_getit (9); };
-	option  "Text Processing Tools", action { toggle_getit (10); };
-	option  "X11 base and clients",	 action { toggle_getit (11); };
-	option  "X11 fonts",		 action { toggle_getit (12); };
-	option  "X11 servers",		 action { toggle_getit (13); };
-	option  "X contrib clients",	 action { toggle_getit (14); };
-	option  "X11 programming",	 action { toggle_getit (15); };
-	option  "X11 Misc.",		 action { toggle_getit (16); };
+	option	"Kernel (ADI_BRH)",	 action { toggle_getit (0); };
+	option	"Kernel (INTEGRATOR)",	 action { toggle_getit (1); };
+	option	"Kernel (IQ80310)",	 action { toggle_getit (2); };
+	option	"Kernel (IQ80321)",	 action { toggle_getit (3); };
+	option	"Kernel (TEAMASA_NPWR)", action { toggle_getit (4); };
+	option	"Base",			 action { toggle_getit (5); };
+	option	"System (/etc)",	 action { toggle_getit (6); };
+	option  "Compiler Tools", 	 action { toggle_getit (7); };
+	option  "Games", 		 action { toggle_getit (8); };
+	option  "Online Manual Pages", 	 action { toggle_getit (9); };
+	option  "Miscellaneous", 	 action { toggle_getit (10); };
+	option  "Text Processing Tools", action { toggle_getit (11); };
+	option  "X11 base and clients",	 action { toggle_getit (12); };
+	option  "X11 fonts",		 action { toggle_getit (13); };
+	option  "X11 servers",		 action { toggle_getit (14); };
+	option  "X contrib clients",	 action { toggle_getit (15); };
+	option  "X11 programming",	 action { toggle_getit (16); };
+	option  "X11 Misc.",		 action { toggle_getit (17); };
diff --git a/distrib/utils/sysinst/arch/evbarm/menus.md.fr b/distrib/utils/sysinst/arch/evbarm/menus.md.fr
index ec203cc12de9..97470db863e4 100644
--- a/distrib/utils/sysinst/arch/evbarm/menus.md.fr
+++ b/distrib/utils/sysinst/arch/evbarm/menus.md.fr
@@ -1,4 +1,4 @@
-/*	$NetBSD: menus.md.fr,v 1.2 2002/04/13 02:34:18 thorpej Exp $	*/
+/*	$NetBSD: menus.md.fr,v 1.3 2003/04/10 17:05:25 thorpej Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -57,20 +57,21 @@ menu editfsparts, y=12, exit;
  
 menu md_distcustom, x=26, y=5, exit, title "Sélection des composants";
 	display action { show_cur_distsets (); };
-	option	"Kernel (INTEGRATOR)",	 action { toggle_getit (0); };
-	option	"Kernel (IQ80310)",	 action { toggle_getit (1); };
-	option	"Kernel (IQ80321)",	 action { toggle_getit (2); };
-	option	"Kernel (TEAMASA_NPWR)", action { toggle_getit (3); };
-	option	"Base",			 action { toggle_getit (4); };
-	option	"System (/etc)",	 action { toggle_getit (5); };
-	option  "Outils de développement", 	 action { toggle_getit (6); };
-	option  "Jeux", 		 action { toggle_getit (7); };
-	option  "Pages de manuel", 	 action { toggle_getit (8); };
-	option  "Divers", 	 action { toggle_getit (9); };
-	option  "Outils de manipulation de textes", action { toggle_getit (10); };
-	option  "X11 base et clients",	 action { toggle_getit (11); };
-	option  "X11 polices",		 action { toggle_getit (12); };
-	option  "X11 serveurs",		 action { toggle_getit (13); };
-	option  "X11 clients contribués", action { toggle_getit (14); };
-	option  "X11 développement",	 action { toggle_getit (15); };
-	option  "X11 Misc.",		 action { toggle_getit (16); };
+	option	"Kernel (ADI_BRH)",	 action { toggle_getit (0); };
+	option	"Kernel (INTEGRATOR)",	 action { toggle_getit (1); };
+	option	"Kernel (IQ80310)",	 action { toggle_getit (2); };
+	option	"Kernel (IQ80321)",	 action { toggle_getit (3); };
+	option	"Kernel (TEAMASA_NPWR)", action { toggle_getit (4); };
+	option	"Base",			 action { toggle_getit (5); };
+	option	"System (/etc)",	 action { toggle_getit (6); };
+	option  "Outils de développement", 	 action { toggle_getit (7); };
+	option  "Jeux", 		 action { toggle_getit (8); };
+	option  "Pages de manuel", 	 action { toggle_getit (9); };
+	option  "Divers", 	 action { toggle_getit (10); };
+	option  "Outils de manipulation de textes", action { toggle_getit (11); };
+	option  "X11 base et clients",	 action { toggle_getit (12); };
+	option  "X11 polices",		 action { toggle_getit (13); };
+	option  "X11 serveurs",		 action { toggle_getit (14); };
+	option  "X11 clients contribués", action { toggle_getit (15); };
+	option  "X11 développement",	 action { toggle_getit (16); };
+	option  "X11 Misc.",		 action { toggle_getit (17); };
diff --git a/distrib/utils/sysinst/arch/evbarm/menus.md.pl b/distrib/utils/sysinst/arch/evbarm/menus.md.pl
index 02c5b473526e..9e66a3982514 100644
--- a/distrib/utils/sysinst/arch/evbarm/menus.md.pl
+++ b/distrib/utils/sysinst/arch/evbarm/menus.md.pl
@@ -1,4 +1,4 @@
-/*	$NetBSD: menus.md.pl,v 1.2 2002/04/13 02:34:18 thorpej Exp $	*/
+/*	$NetBSD: menus.md.pl,v 1.3 2003/04/10 17:05:25 thorpej Exp $	*/
 /* Based on english version: */
 /*	NetBSD: menus.md.en,v 1.2 2002/03/31 02:14:06 thorpej Exp */
 
@@ -59,20 +59,21 @@ menu editfsparts, y=12, exit;
  
 menu md_distcustom, x=26, y=5, exit, title "Wybierz";
 	display action { show_cur_distsets (); };
-	option	"Kernel (INTEGRATOR)",	 action { toggle_getit (0); };
-	option	"Kernel (IQ80310)",	 action { toggle_getit (1); };
-	option	"Kernel (IQ80321)",	 action { toggle_getit (2); };
-	option	"Kernel (TEAMASA_NPWR)", action { toggle_getit (3); };
-	option	"Base",			 action { toggle_getit (4); };
-	option	"System (/etc)",	 action { toggle_getit (5); };
-	option	"Compiler Tools",	 action { toggle_getit (6); };
-	option	"Games",		 action { toggle_getit (7); };
-	option	"Online Manual Pages",	 action { toggle_getit (8); };
-	option	"Miscellaneous",	 action { toggle_getit (9); };
-	option	"Text Processing Tools", action { toggle_getit (10); };
-	option	"X11 base and clients",	 action { toggle_getit (11); };
-	option	"X11 fonts",		 action { toggle_getit (12); };
-	option	"X11 servers",		 action { toggle_getit (13); };
-	option	"X contrib clients",	 action { toggle_getit (14); };
-	option	"X11 programming",	 action { toggle_getit (15); };
-	option	"X11 Misc.",		 action { toggle_getit (16); };
+	option	"Kernel (ADI_BRH)",	 action { toggle_getit (0); };
+	option	"Kernel (INTEGRATOR)",	 action { toggle_getit (1); };
+	option	"Kernel (IQ80310)",	 action { toggle_getit (2); };
+	option	"Kernel (IQ80321)",	 action { toggle_getit (3); };
+	option	"Kernel (TEAMASA_NPWR)", action { toggle_getit (4); };
+	option	"Base",			 action { toggle_getit (5); };
+	option	"System (/etc)",	 action { toggle_getit (6); };
+	option	"Compiler Tools",	 action { toggle_getit (7); };
+	option	"Games",		 action { toggle_getit (8); };
+	option	"Online Manual Pages",	 action { toggle_getit (9); };
+	option	"Miscellaneous",	 action { toggle_getit (10); };
+	option	"Text Processing Tools", action { toggle_getit (11); };
+	option	"X11 base and clients",	 action { toggle_getit (12); };
+	option	"X11 fonts",		 action { toggle_getit (13); };
+	option	"X11 servers",		 action { toggle_getit (14); };
+	option	"X contrib clients",	 action { toggle_getit (15); };
+	option	"X11 programming",	 action { toggle_getit (16); };
+	option	"X11 Misc.",		 action { toggle_getit (17); };