Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix non-i386 builds

This commit is contained in:
dsl 2003-07-07 12:55:48 +00:00
parent 0e919832bd
commit 33ae7b798b
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
distrib/utils/sysinst/mbr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mbr.c,v 1.42 2003/07/07 12:30:20 dsl Exp $ */ /* $NetBSD: mbr.c,v 1.43 2003/07/07 12:55:48 dsl Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -1116,7 +1116,9 @@ edit_mbr(mbr_info_t *mbri)
free(ext); free(ext);
} }
memset(part, 0, NMBRPART * sizeof *part); memset(part, 0, NMBRPART * sizeof *part);
#ifdef BOOTSEL
memset(&mbri->nametab, 0, sizeof mbri->nametab); memset(&mbri->nametab, 0, sizeof mbri->nametab);
#endif
part[0].mbrp_typ = MBR_PTYPE_NETBSD; part[0].mbrp_typ = MBR_PTYPE_NETBSD;
part[0].mbrp_size = dlsize - bsec; part[0].mbrp_size = dlsize - bsec;
part[0].mbrp_start = bsec; part[0].mbrp_start = bsec;
@ -1363,8 +1365,6 @@ write_mbr(const char *disk, mbr_info_t *mbri, int convert)
mbri->mbr.mbr_bootsel.mbrb_defkey = SCAN_ENTER; mbri->mbr.mbr_bootsel.mbrb_defkey = SCAN_ENTER;
} else } else
netbsd_bootcode = 0; netbsd_bootcode = 0;
#else
#define netbsd_bootcode 0 /* CONSTCOND */
#endif #endif
/* Open the disk. */ /* Open the disk. */
@ -1374,11 +1374,13 @@ write_mbr(const char *disk, mbr_info_t *mbri, int convert)
for (ext = mbri; ext != NULL; ext = ext->extended) { for (ext = mbri; ext != NULL; ext = ext->extended) {
mbr = &ext->mbr; mbr = &ext->mbr;
#ifdef BOOTSEL
if (netbsd_bootcode) { if (netbsd_bootcode) {
mbri->mbr.mbr_bootsel.mbrb_magic = htole16(MBR_MAGIC); mbri->mbr.mbr_bootsel.mbrb_magic = htole16(MBR_MAGIC);
memcpy(&mbr->mbr_bootsel.mbrb_nametab, &ext->nametab, memcpy(&mbr->mbr_bootsel.mbrb_nametab, &ext->nametab,
sizeof mbr->mbr_bootsel.mbrb_nametab); sizeof mbr->mbr_bootsel.mbrb_nametab);
} }
#endif
mbrp = &mbr->mbr_parts[0]; mbrp = &mbr->mbr_parts[0];
for (i = 0; i < NMBRPART; i++) { for (i = 0; i < NMBRPART; i++) {
if (mbrp[i].mbrp_start == 0 && mbrp[i].mbrp_size == 0) { if (mbrp[i].mbrp_start == 0 && mbrp[i].mbrp_size == 0) {
@ -1402,11 +1404,13 @@ write_mbr(const char *disk, mbr_info_t *mbri, int convert)
&mbrp[i].mbrp_ecyl, &mbrp[i].mbrp_ehd, &mbrp[i].mbrp_ecyl, &mbrp[i].mbrp_ehd,
&mbrp[i].mbrp_esect, pstart + psize - 1); &mbrp[i].mbrp_esect, pstart + psize - 1);
} }
#ifdef BOOTSEL
if (netbsd_bootcode && ext->nametab[i][0] != 0) { if (netbsd_bootcode && ext->nametab[i][0] != 0) {
if (ext->sector + pstart == mbri->bootsec) if (ext->sector + pstart == mbri->bootsec)
mbri->mbr.mbr_bootsel.mbrb_defkey = key; mbri->mbr.mbr_bootsel.mbrb_defkey = key;
key++; key++;
} }
#endif
} }
mbr->mbr_signature = htole16(MBR_MAGIC); mbr->mbr_signature = htole16(MBR_MAGIC);

6
distrib/utils/sysinst/msg.mbr.en
View File

@ -1,4 +1,4 @@
/* $NetBSD: msg.mbr.en,v 1.6 2003/07/07 12:30:21 dsl Exp $ */ /* $NetBSD: msg.mbr.en,v 1.7 2003/07/07 12:55:48 dsl Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -201,7 +201,8 @@ message dofdisk
message wmbrfail message wmbrfail
{Rewrite of MBR failed. I can't continue.} {Rewrite of MBR failed. I can't continue.}
.if BOOTSEL && 0 .if 0
.if BOOTSEL
message Set_timeout_value message Set_timeout_value
{Set timeout value} {Set timeout value}
@ -209,4 +210,5 @@ message bootseltimeout
{Boot menu timeout: %d\n} {Boot menu timeout: %d\n}
.endif .endif
.endif

6
distrib/utils/sysinst/msg.mbr.fr
View File

@ -1,4 +1,4 @@
/* $NetBSD: msg.mbr.fr,v 1.7 2003/07/07 12:30:21 dsl Exp $ */ /* $NetBSD: msg.mbr.fr,v 1.8 2003/07/07 12:55:48 dsl Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -207,7 +207,8 @@ message dofdisk
message wmbrfail message wmbrfail
{L'écriture du MBR a échouée. Je ne peux pas continuer.} {L'écriture du MBR a échouée. Je ne peux pas continuer.}
.if BOOTSEL && 0 .if 0
.if BOOTSEL
message Set_timeout_value message Set_timeout_value
{Changer le temps d'attente} {Changer le temps d'attente}
@ -215,3 +216,4 @@ message bootseltimeout
{Temps d'attente: %d\n} {Temps d'attente: %d\n}
.endif .endif
.endif

6
distrib/utils/sysinst/msg.mbr.pl
View File

@ -1,4 +1,4 @@
/* $NetBSD: msg.mbr.pl,v 1.6 2003/07/07 12:30:21 dsl Exp $ */ /* $NetBSD: msg.mbr.pl,v 1.7 2003/07/07 12:55:48 dsl Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -212,7 +212,8 @@ message dofdisk
message wmbrfail message wmbrfail
{Nadpisanie MBR nie powiodlo sie. Nie moge kontynuowac.} {Nadpisanie MBR nie powiodlo sie. Nie moge kontynuowac.}
.if BOOTSEL && 0 .if 0
.if BOOTSEL
message Set_timeout_value message Set_timeout_value
{Ustaw opoznienie} {Ustaw opoznienie}
@ -220,3 +221,4 @@ message bootseltimeout
{Opoznienie bootmenu: %d\n} {Opoznienie bootmenu: %d\n}
.endif .endif
.endif