[src/netbsd-9]: src/usr.sbin/sysinst Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/df1cf41293de
branches:  netbsd-9
changeset: 466047:df1cf41293de
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Mon Dec 09 19:33:25 2019 +0000

description:
Pull up following revision(s) (requested by martin in ticket #538):
        usr.sbin/sysinst/bsddisklabel.c: revision 1.32
PR install/54745: fix confusion about absolut and NetBSD-partition
relative offsets.

diffstat:

 usr.sbin/sysinst/bsddisklabel.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r dca08b269872 -r df1cf41293de usr.sbin/sysinst/bsddisklabel.c
--- a/usr.sbin/sysinst/bsddisklabel.c   Mon Dec 09 19:31:18 2019 +0000
+++ b/usr.sbin/sysinst/bsddisklabel.c   Mon Dec 09 19:33:25 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bsddisklabel.c,v 1.23.2.6 2019/11/17 13:45:26 msaitoh Exp $    */
+/*     $NetBSD: bsddisklabel.c,v 1.23.2.7 2019/12/09 19:33:25 bouyer Exp $     */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1342,7 +1342,8 @@
        /*
         * Now add new inner partitions (and cloned partitions)
         */
-       for (i = 0; i < wanted->num && from < wanted->parts->disk_size; i++) {
+       for (i = 0; i < wanted->num && from < 
+           (wanted->parts->disk_size + wanted->parts->disk_start); i++) {
                struct part_usage_info *want = &wanted->infos[i];
 
                if (want->cur_part_id != NO_PART)