[src/netbsd-7]: src/usr.sbin/sysinst Pull up the following revisions(s) (requ...

[sborrill <sborrill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8fdbd1a0742d
branches:  netbsd-7
changeset: 798455:8fdbd1a0742d
user:      sborrill <sborrill%NetBSD.org@localhost>
date:      Wed Oct 22 12:28:30 2014 +0000

description:
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.

diffstat:

 usr.sbin/sysinst/mbr.c |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (21 lines):

diff -r 91e7f91f985b -r 8fdbd1a0742d usr.sbin/sysinst/mbr.c
--- a/usr.sbin/sysinst/mbr.c    Mon Oct 20 09:55:54 2014 +0000
+++ b/usr.sbin/sysinst/mbr.c    Wed Oct 22 12:28:30 2014 +0000
@@ -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 @@
         */
        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)