From aff9047a41eb221526eb5df49609916f013ed9f0 Mon Sep 17 00:00:00 2001 From: snj Date: Sat, 5 May 2007 22:23:33 +0000 Subject: [PATCH] Remove GENERIC.MPACPI from the list of kernels, as it is no longer built. Pointed out by smb. --- distrib/utils/sysinst/arch/i386/md.h | 20 +++++++++----------- distrib/utils/sysinst/arch/i386/msg.md.de | 11 +++++------ distrib/utils/sysinst/arch/i386/msg.md.en | 11 +++++------ distrib/utils/sysinst/arch/i386/msg.md.es | 11 +++++------ distrib/utils/sysinst/arch/i386/msg.md.fr | 11 +++++------ distrib/utils/sysinst/arch/i386/msg.md.pl | 11 +++++------ 6 files changed, 34 insertions(+), 41 deletions(-) diff --git a/distrib/utils/sysinst/arch/i386/md.h b/distrib/utils/sysinst/arch/i386/md.h index 1978471b63e4..998ee35c8845 100644 --- a/distrib/utils/sysinst/arch/i386/md.h +++ b/distrib/utils/sysinst/arch/i386/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.56 2006/11/19 11:37:32 dsl Exp $ */ +/* $NetBSD: md.h,v 1.57 2007/05/05 22:23:33 snj Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -64,19 +64,17 @@ #define SET_KERNEL_GENERIC SET_KERNEL_1 #define SET_KERNEL_MP SET_KERNEL_2 -#define SET_KERNEL_MPACPI SET_KERNEL_3 -#define SET_KERNEL_LAPTOP SET_KERNEL_4 -#define SET_KERNEL_DIAGNOSTIC SET_KERNEL_5 -/* #define SET_KERNEL_TINY SET_KERNEL_6 */ -/* #define SET_KERNEL_PS2 SET_KERNEL_7 */ +#define SET_KERNEL_LAPTOP SET_KERNEL_3 +#define SET_KERNEL_DIAGNOSTIC SET_KERNEL_4 +/* #define SET_KERNEL_TINY SET_KERNEL_5 */ +/* #define SET_KERNEL_PS2 SET_KERNEL_6 */ #define SET_KERNEL_1_NAME "kern-GENERIC" #define SET_KERNEL_2_NAME "kern-GENERIC.MP" -#define SET_KERNEL_3_NAME "kern-GENERIC.MPACPI" -#define SET_KERNEL_4_NAME "kern-GENERIC_LAPTOP" -#define SET_KERNEL_5_NAME "kern-GENERIC_DIAGNOSTIC" -/* #define SET_KERNEL_6_NAME "kern-GENERIC_TINY" */ -/* #define SET_KERNEL_7_NAME "kern-GENERIC_PS2TINY" */ +#define SET_KERNEL_3_NAME "kern-GENERIC_LAPTOP" +#define SET_KERNEL_4_NAME "kern-GENERIC_DIAGNOSTIC" +/* #define SET_KERNEL_5_NAME "kern-GENERIC_TINY" */ +/* #define SET_KERNEL_6_NAME "kern-GENERIC_PS2TINY" */ /* * Disk names accepted as valid targets for a from-scratch installation. diff --git a/distrib/utils/sysinst/arch/i386/msg.md.de b/distrib/utils/sysinst/arch/i386/msg.md.de index 0f469befdb9f..0ce246939d3a 100644 --- a/distrib/utils/sysinst/arch/i386/msg.md.de +++ b/distrib/utils/sysinst/arch/i386/msg.md.de @@ -1,4 +1,4 @@ -/* $NetBSD: msg.md.de,v 1.9 2006/12/17 16:59:40 dsl Exp $ */ +/* $NetBSD: msg.md.de,v 1.10 2007/05/05 22:23:33 snj Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -170,8 +170,7 @@ NetBSD Bootcodes updaten?} message set_kernel_1 {Kernel (GENERIC)} message set_kernel_2 {Kernel (GENERIC.MP)} -message set_kernel_3 {Kernel (GENERIC.MPACPI)} -message set_kernel_4 {Kernel (GENERIC_LAPTOP)} -message set_kernel_5 {Kernel (GENERIC_DIAGNOSTIC)} -/* message set_kernel_6 {Kernel (GENERIC_TINY)} */ -/* message set_kernel_7 {Kernel (GENERIC_PS2TINY)} */ +message set_kernel_3 {Kernel (GENERIC_LAPTOP)} +message set_kernel_4 {Kernel (GENERIC_DIAGNOSTIC)} +/* message set_kernel_5 {Kernel (GENERIC_TINY)} */ +/* message set_kernel_6 {Kernel (GENERIC_PS2TINY)} */ diff --git a/distrib/utils/sysinst/arch/i386/msg.md.en b/distrib/utils/sysinst/arch/i386/msg.md.en index bab82ce0655d..1e503d194124 100644 --- a/distrib/utils/sysinst/arch/i386/msg.md.en +++ b/distrib/utils/sysinst/arch/i386/msg.md.en @@ -1,4 +1,4 @@ -/* $NetBSD: msg.md.en,v 1.51 2006/12/17 16:59:40 dsl Exp $ */ +/* $NetBSD: msg.md.en,v 1.52 2007/05/05 22:23:33 snj Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -165,8 +165,7 @@ the latest version of the NetBSD bootcode?} message set_kernel_1 {Kernel (GENERIC)} message set_kernel_2 {Kernel (GENERIC.MP)} -message set_kernel_3 {Kernel (GENERIC.MPACPI)} -message set_kernel_4 {Kernel (GENERIC_LAPTOP)} -message set_kernel_5 {Kernel (GENERIC_DIAGNOSTIC)} -/* message set_kernel_6 {Kernel (GENERIC_TINY)} */ -/* message set_kernel_7 {Kernel (GENERIC_PS2TINY)} */ +message set_kernel_3 {Kernel (GENERIC_LAPTOP)} +message set_kernel_4 {Kernel (GENERIC_DIAGNOSTIC)} +/* message set_kernel_5 {Kernel (GENERIC_TINY)} */ +/* message set_kernel_6 {Kernel (GENERIC_PS2TINY)} */ diff --git a/distrib/utils/sysinst/arch/i386/msg.md.es b/distrib/utils/sysinst/arch/i386/msg.md.es index 1b471abbe30d..4a60b57ab665 100644 --- a/distrib/utils/sysinst/arch/i386/msg.md.es +++ b/distrib/utils/sysinst/arch/i386/msg.md.es @@ -1,4 +1,4 @@ -/* $NetBSD: msg.md.es,v 1.4 2006/12/17 16:59:40 dsl Exp $ */ +/* $NetBSD: msg.md.es,v 1.5 2007/05/05 22:23:33 snj Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -166,8 +166,7 @@ Record a la ultima versi message set_kernel_1 {Núcleo (GENERIC)} message set_kernel_2 {Núcleo (GENERIC.MP)} -message set_kernel_3 {Núcleo (GENERIC.MPACPI)} -message set_kernel_4 {Núcleo (GENERIC_LAPTOP)} -message set_kernel_5 {Núcleo (GENERIC_DIAGNOSTIC)} -/* message set_kernel_6 {Núcleo (GENERIC_TINY)} */ -/* message set_kernel_7 {Núcleo (GENERIC_PS2TINY)} */ +message set_kernel_3 {Núcleo (GENERIC_LAPTOP)} +message set_kernel_4 {Núcleo (GENERIC_DIAGNOSTIC)} +/* message set_kernel_5 {Núcleo (GENERIC_TINY)} */ +/* message set_kernel_6 {Núcleo (GENERIC_PS2TINY)} */ diff --git a/distrib/utils/sysinst/arch/i386/msg.md.fr b/distrib/utils/sysinst/arch/i386/msg.md.fr index 332b1caf4ceb..4ea43db2502e 100644 --- a/distrib/utils/sysinst/arch/i386/msg.md.fr +++ b/distrib/utils/sysinst/arch/i386/msg.md.fr @@ -1,4 +1,4 @@ -/* $NetBSD: msg.md.fr,v 1.41 2006/12/17 16:59:40 dsl Exp $ */ +/* $NetBSD: msg.md.fr,v 1.42 2007/05/05 22:23:34 snj Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -157,8 +157,7 @@ avec la derni message set_kernel_1 {Kernel (GENERIC)} message set_kernel_2 {Kernel (GENERIC.MP)} -message set_kernel_3 {Kernel (GENERIC.MPACPI)} -message set_kernel_4 {Kernel (GENERIC_LAPTOP)} -message set_kernel_5 {Kernel (GENERIC_DIAGNOSTIC)} -/* message set_kernel_6 {Kernel (GENERIC_TINY)} */ -/* message set_kernel_7 {Kernel (GENERIC_PS2TINY)} */ +message set_kernel_3 {Kernel (GENERIC_LAPTOP)} +message set_kernel_4 {Kernel (GENERIC_DIAGNOSTIC)} +/* message set_kernel_5 {Kernel (GENERIC_TINY)} */ +/* message set_kernel_6 {Kernel (GENERIC_PS2TINY)} */ diff --git a/distrib/utils/sysinst/arch/i386/msg.md.pl b/distrib/utils/sysinst/arch/i386/msg.md.pl index bd0785d6052d..482ece5f947e 100644 --- a/distrib/utils/sysinst/arch/i386/msg.md.pl +++ b/distrib/utils/sysinst/arch/i386/msg.md.pl @@ -1,4 +1,4 @@ -/* $NetBSD: msg.md.pl,v 1.24 2006/12/17 16:59:40 dsl Exp $ */ +/* $NetBSD: msg.md.pl,v 1.25 2007/05/05 22:23:34 snj Exp $ */ /* Based on english version: */ /* NetBSD: msg.md.en,v 1.24 2001/01/27 07:34:39 jmc Exp */ @@ -160,8 +160,7 @@ the latest version of the NetBSD bootcode?} message set_kernel_1 {Kernel (GENERIC)} message set_kernel_2 {Kernel (GENERIC.MP)} -message set_kernel_3 {Kernel (GENERIC.MPACPI)} -message set_kernel_4 {Kernel (GENERIC_LAPTOP)} -message set_kernel_5 {Kernel (GENERIC_DIAGNOSTIC)} -/* message set_kernel_6 {Kernel (GENERIC_TINY)} */ -/* message set_kernel_7 {Kernel (GENERIC_PS2TINY)} */ +message set_kernel_3 {Kernel (GENERIC_LAPTOP)} +message set_kernel_4 {Kernel (GENERIC_DIAGNOSTIC)} +/* message set_kernel_5 {Kernel (GENERIC_TINY)} */ +/* message set_kernel_6 {Kernel (GENERIC_PS2TINY)} */