Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/i386/stand/lib Fix btinfo_bootdisk's labelsector an...



details:   https://anonhg.NetBSD.org/src/rev/d453545c6ac7
branches:  trunk
changeset: 769737:d453545c6ac7
user:      gsutre <gsutre%NetBSD.org@localhost>
date:      Wed Sep 21 08:57:12 2011 +0000

description:
Fix btinfo_bootdisk's labelsector and btinfo_bootwedge's startblk for
the non-GPT case.

ok jakllsch@

diffstat:

 sys/arch/i386/stand/lib/biosdisk.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (24 lines):

diff -r 5c765b028d98 -r d453545c6ac7 sys/arch/i386/stand/lib/biosdisk.c
--- a/sys/arch/i386/stand/lib/biosdisk.c        Wed Sep 21 02:15:18 2011 +0000
+++ b/sys/arch/i386/stand/lib/biosdisk.c        Wed Sep 21 08:57:12 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: biosdisk.c,v 1.38 2011/07/17 20:54:41 joerg Exp $      */
+/*     $NetBSD: biosdisk.c,v 1.39 2011/09/21 08:57:12 gsutre Exp $     */
 
 /*
  * Copyright (c) 1996, 1998
@@ -389,12 +389,12 @@
        ingest_label(d, lp);
 
 #ifdef _STANDALONE
-       bi_disk.labelsector = d->boff + LABELSECTOR;
+       bi_disk.labelsector = sector + LABELSECTOR;
        bi_disk.label.type = lp->d_type;
        memcpy(bi_disk.label.packname, lp->d_packname, 16);
        bi_disk.label.checksum = lp->d_checksum;
 
-       bi_wedge.matchblk = d->boff + LABELSECTOR;
+       bi_wedge.matchblk = sector + LABELSECTOR;
        bi_wedge.matchnblks = 1;
 
        md5(bi_wedge.matchhash, d->buf, d->ll.secsize);



Home | Main Index | Thread Index | Old Index