Revert revs 1.29 and 1.30, to make it easier to pullup an alternative fix.
Ok'ed by christos@ http://mail-index.netbsd.org/source-changes-d/2014/11/15/msg007338.html
This commit is contained in:
parent
31da12f323
commit
bdfce4082b
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: installboot.c,v 1.30 2014/11/13 17:46:49 christos Exp $ */
|
/* $NetBSD: installboot.c,v 1.31 2014/11/16 13:38:39 tsutsui Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1995 Waldi Ravens
|
* Copyright (c) 1995 Waldi Ravens
|
||||||
|
@ -467,7 +467,6 @@ mkbootblock(struct bootblock *bb, char *xxb, char *bxx,
|
||||||
struct disklabel *label, u_int magic)
|
struct disklabel *label, u_int magic)
|
||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
uint16_t sum;
|
|
||||||
|
|
||||||
memset(bb, 0, sizeof(*bb));
|
memset(bb, 0, sizeof(*bb));
|
||||||
|
|
||||||
|
@ -499,10 +498,8 @@ mkbootblock(struct bootblock *bb, char *xxb, char *bxx,
|
||||||
setIDEpar(bb->bb_xxboot, sizeof(bb->bb_xxboot));
|
setIDEpar(bb->bb_xxboot, sizeof(bb->bb_xxboot));
|
||||||
|
|
||||||
/* set AHDI checksum */
|
/* set AHDI checksum */
|
||||||
sum = 0;
|
*((u_int16_t *)bb->bb_xxboot + 255) = 0;
|
||||||
memcpy(bb->bb_xxboot + 255 * sizeof(sum), &sum, sizeof(sum));
|
*((u_int16_t *)bb->bb_xxboot + 255) = 0x1234 - abcksum(bb->bb_xxboot);
|
||||||
sum = 0x1234 - abcksum(bb->bb_xxboot);
|
|
||||||
memcpy(bb->bb_xxboot + 255 * sizeof(sum), &sum, sizeof(sum));
|
|
||||||
|
|
||||||
if (verbose) {
|
if (verbose) {
|
||||||
printf("Primary boot loader: %s\n", xxb);
|
printf("Primary boot loader: %s\n", xxb);
|
||||||
|
|
Loading…
Reference in New Issue