Various tweaks for IP12:

* Add the IP12 kernel set to the list, and make it the default kernel selection
  if we're installing on an IP12,
* Don't install ARCS bootblocks on IP12,
* Install the ECOFF kernel to the volume header for IP12.
This commit is contained in:
sekiya 2004-11-13 10:26:39 +00:00
parent 42728e787e
commit cc1b1e3980
6 changed files with 33 additions and 14 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.16 2004/08/14 16:06:42 dsl Exp $ */
/* $NetBSD: md.c,v 1.17 2004/11/13 10:26:39 sekiya Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -118,13 +118,14 @@ md_post_disklabel(void)
return run_program(RUN_DISPLAY,
"%s %s", "/usr/mdec/sgivol -f -w boot /usr/mdec/ip3xboot",
diskdev);
else
run_program(RUN_DISPLAY,
"%s %s", "/usr/mdec/sgivol -f -w aoutboot /usr/mdec/aoutboot",
diskdev);
return run_program(RUN_DISPLAY,
"%s %s", "/usr/mdec/sgivol -f -w boot /usr/mdec/ip2xboot",
diskdev);
else if (strstr(instsys.version, "(INSTALL32_IP2x)")) {
run_program(RUN_DISPLAY,
"%s %s", "/usr/mdec/sgivol -f -w aoutboot /usr/mdec/aoutboot",
diskdev);
return run_program(RUN_DISPLAY,
"%s %s", "/usr/mdec/sgivol -f -w boot /usr/mdec/ip2xboot",
diskdev);
}
}
int
@ -178,6 +179,9 @@ md_cleanup_install(void)
run_program(0, "rm -f %s", target_expand("/sysinst"));
run_program(0, "rm -f %s", target_expand("/.termcap"));
run_program(0, "rm -f %s", target_expand("/.profile"));
if (strstr(instsys.version, "(GENERIC32_IP12)"))
run_program(0, "/usr/mdec/sgivol -f -w netbsd %s %s",
target_expand("/netbsd.ecoff"), diskdev);
}
int
@ -196,6 +200,8 @@ md_init()
uname(&instsys);
if (strstr(instsys.version, "(INSTALL32_IP3x)"))
sets_selected = (sets_selected & ~SET_KERNEL) | SET_KERNEL_2;
else
else if (strstr(instsys.version, "(INSTALL32_IP2x)"))
sets_selected = (sets_selected & ~SET_KERNEL) | SET_KERNEL_1;
else if (strstr(instsys.version, "(GENERIC32_IP12)"))
sets_selected = (sets_selected & ~SET_KERNEL) | SET_KERNEL_3;
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.18 2004/06/06 06:07:01 christos Exp $ */
/* $NetBSD: md.h,v 1.19 2004/11/13 10:26:39 sekiya Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -77,6 +77,7 @@
*/
#define SET_KERNEL_1_NAME "kern-GENERIC32_IP2x"
#define SET_KERNEL_2_NAME "kern-GENERIC32_IP3x"
#define SET_KERNEL_3_NAME "kern-GENERIC32_IP12"
#define MD_SETS_SELECTED (SET_KERNEL_1 | SET_SYSTEM)
/*

View File

@ -1,4 +1,4 @@
/* $NetBSD: msg.md.de,v 1.3 2004/03/04 15:26:02 martin Exp $ */
/* $NetBSD: msg.md.de,v 1.4 2004/11/13 10:26:39 sekiya Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -60,3 +60,6 @@ message set_kernel_1
message set_kernel_2
{Kernel (GENERIC32_IP3x)}
message set_kernel_3
{Kernel (GENERIC32_IP12)}

View File

@ -1,4 +1,4 @@
/* $NetBSD: msg.md.en,v 1.5 2003/11/13 02:33:39 sekiya Exp $ */
/* $NetBSD: msg.md.en,v 1.6 2004/11/13 10:26:39 sekiya Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -59,3 +59,6 @@ message set_kernel_1
message set_kernel_2
{Kernel (GENERIC32_IP3x)}
message set_kernel_3
{Kernel (GENERIC32_IP12)}

View File

@ -1,4 +1,4 @@
/* $NetBSD: msg.md.fr,v 1.5 2003/11/13 02:33:39 sekiya Exp $ */
/* $NetBSD: msg.md.fr,v 1.6 2004/11/13 10:26:39 sekiya Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -60,3 +60,6 @@ message set_kernel_1
message set_kernel_2
{Kernel (GENERIC32_IP3x)}
message set_kernel_3
{Kernel (GENERIC32_IP12)}

View File

@ -1,4 +1,4 @@
/* $NetBSD: msg.md.pl,v 1.6 2003/11/13 02:33:39 sekiya Exp $ */
/* $NetBSD: msg.md.pl,v 1.7 2004/11/13 10:26:39 sekiya Exp $ */
/* Based on english version: */
/* NetBSD: msg.md.en,v 1.1 2001/11/20 15:53:24 soren Exp */
@ -62,3 +62,6 @@ message set_kernel_1
message set_kernel_2
{Kernel (GENERIC32_IP3x)}
message set_kernel_3
{Kernel (GENERIC32_IP12)}