Subject: Re: install/35264
To: None <install-manager@netbsd.org, gnats-admin@netbsd.org,>
From: Joerg Niendorf <joerg.bsd@internode.net.au>
List: netbsd-bugs
Date: 12/17/2006 04:05:03
The following reply was made to PR install/35264; it has been noted by GNATS.

From: Joerg Niendorf <joerg.bsd@internode.net.au>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: install/35264
Date: Sun, 17 Dec 2006 03:35:54 +1000

 It would appear that this bug was introduced with this change:
 
 http://cvsweb.netbsd.org/bsdweb.cgi/src/distrib/utils/sysinst/arch/i386/md.h.diff?r1=1.55&r2=1.56&f=h
 
 After the above change, md.h looks (partly) out of synch with the
 msg.md.* files under src/distrib/utils/sysinst/arch/i386/ :
 
 md.h:
 #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_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" */
 
 
 msg.md.en:
 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_TINY)}
 message set_kernel_5    {Kernel (GENERIC_LAPTOP)}
 message set_kernel_6    {Kernel (GENERIC_DIAGNOSTIC)}
 
 
 This seems to cause the mix-up in src/distrib/utils/sysinst/util.c:
 
 distinfo dist_list[] = {
 #ifdef SET_KERNEL_1_NAME
         {SET_KERNEL_1_NAME, SET_KERNEL_1, MSG_set_kernel_1, NULL},
 #endif
 #ifdef SET_KERNEL_2_NAME
         {SET_KERNEL_2_NAME, SET_KERNEL_2, MSG_set_kernel_2, NULL},
 #endif
 #ifdef SET_KERNEL_3_NAME
         {SET_KERNEL_3_NAME, SET_KERNEL_3, MSG_set_kernel_3, NULL},
 #endif
 #ifdef SET_KERNEL_4_NAME
         {SET_KERNEL_4_NAME, SET_KERNEL_4, MSG_set_kernel_4, NULL},
 #endif
 #ifdef SET_KERNEL_5_NAME
         {SET_KERNEL_5_NAME, SET_KERNEL_5, MSG_set_kernel_5, NULL},
 #endif
 #ifdef SET_KERNEL_6_NAME
         {SET_KERNEL_6_NAME, SET_KERNEL_6, MSG_set_kernel_6, NULL},
 
 
 
 Please correct me if I'm wrong.
 
 Cheers,
 Joerg