[src/netbsd-6-0]: src/distrib/utils/sysinst Pull up following revision(s) (re...

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

details:   https://anonhg.NetBSD.org/src/rev/88aa0c0d45f8
branches:  netbsd-6-0
changeset: 774877:88aa0c0d45f8
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sun Oct 20 13:43:26 2013 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #972):
        distrib/utils/sysinst/mbr.c: revision 1.92
Fix another botch of my dumb patch in PR/45990; add missing braces.
The offset of MBR partition 0 was unintentionally set to 2048 even on
small (<=128GB) disks.  Probably we should rethink the threshold,
but anyway sysinst(8) should follow fdisk(8) default.
http://nxr.NetBSD.org/xref/src/sbin/fdisk/fdisk.c?r=1.145#1199
http://cvsweb.NetBSD.org/bsdweb.cgi/src/sbin/fdisk/fdisk.c#rev1.129
The problem is pointed out and analyzed by Simon Nicolussi in PR/48304.
Should be pulled up to all netbsd-6* branches.

diffstat:

 distrib/utils/sysinst/mbr.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (20 lines):

diff -r 30cc5b642db7 -r 88aa0c0d45f8 distrib/utils/sysinst/mbr.c
--- a/distrib/utils/sysinst/mbr.c       Sun Oct 20 13:40:10 2013 +0000
+++ b/distrib/utils/sysinst/mbr.c       Sun Oct 20 13:43:26 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mbr.c,v 1.89.2.2 2012/06/12 19:19:20 riz Exp $ */
+/*     $NetBSD: mbr.c,v 1.89.2.2.4.1 2013/10/20 13:43:26 bouyer Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1890,8 +1890,9 @@
                }
        } else {
                /* Use 1MB offset for large (>128GB) disks */
-               if (dlsize > 2048 * 1024 * 128)
+               if (dlsize > 2048 * 1024 * 128) {
                        ptn_alignment = 2048;
                        ptn_0_offset = 2048;
+               }
        }
 }