Module Name: src
Committed By: sborrill
Date: Wed Oct 22 12:28:30 UTC 2014
Modified Files:
src/usr.sbin/sysinst [netbsd-7]: mbr.c
Log Message:
Pull up the following revisions(s) (requested by martin in ticket #153):
usr.sbin/sysinst/mbr.c: revision 1.4
On architectures that have no BIOS (and so do not set a BIOS geometry)
we need to initialize the globals bsec, bcyl and bhead before using
them.
To generate a diff of this commit:
cvs rdiff -u -r1.2.4.1 -r1.2.4.2 src/usr.sbin/sysinst/mbr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/mbr.c
diff -u src/usr.sbin/sysinst/mbr.c:1.2.4.1 src/usr.sbin/sysinst/mbr.c:1.2.4.2
--- src/usr.sbin/sysinst/mbr.c:1.2.4.1 Sat Aug 23 03:44:02 2014
+++ src/usr.sbin/sysinst/mbr.c Wed Oct 22 12:28:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mbr.c,v 1.2.4.1 2014/08/23 03:44:02 riz Exp $ */
+/* $NetBSD: mbr.c,v 1.2.4.2 2014/10/22 12:28:30 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1459,6 +1459,11 @@ read_mbr(const char *disk, mbr_info_t *m
*/
if (bsec == 0)
bsec = pm->dlsec;
+ if (bhead == 0)
+ bhead = pm->dlhead;
+ if (bcyl == 0)
+ bhead = pm->dlcyl;
+
ptn_0_offset = bsec;
/* use 1MB default offset on large disks as fdisk(8) */
if (pm->dlsize > 2048 * 1024 * 128)
