Module Name: src
Committed By: gsutre
Date: Wed Sep 21 08:57:12 UTC 2011
Modified Files:
src/sys/arch/i386/stand/lib: biosdisk.c
Log Message:
Fix btinfo_bootdisk's labelsector and btinfo_bootwedge's startblk for
the non-GPT case.
ok jakllsch@
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/i386/stand/lib/biosdisk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/lib/biosdisk.c
diff -u src/sys/arch/i386/stand/lib/biosdisk.c:1.38 src/sys/arch/i386/stand/lib/biosdisk.c:1.39
--- src/sys/arch/i386/stand/lib/biosdisk.c:1.38 Sun Jul 17 20:54:41 2011
+++ src/sys/arch/i386/stand/lib/biosdisk.c Wed Sep 21 08:57:12 2011
@@ -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);
