[src/netbsd-1-4]: src/distrib/utils/sysinst pullup 1.17->1.18 (fvdl): fix upg...

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

details:   https://anonhg.NetBSD.org/src/rev/d36a9b599ab1
branches:  netbsd-1-4
changeset: 469205:d36a9b599ab1
user:      perry <perry%NetBSD.org@localhost>
date:      Mon Jul 12 19:29:37 1999 +0000

description:
pullup 1.17->1.18 (fvdl): fix upgrade core dump

diffstat:

 distrib/utils/sysinst/mbr.c |  19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diffs (42 lines):

diff -r 4287a8706a49 -r d36a9b599ab1 distrib/utils/sysinst/mbr.c
--- a/distrib/utils/sysinst/mbr.c       Mon Jul 12 19:25:28 1999 +0000
+++ b/distrib/utils/sysinst/mbr.c       Mon Jul 12 19:29:37 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mbr.c,v 1.11.2.4 1999/06/24 23:04:10 cgd Exp $ */
+/*     $NetBSD: mbr.c,v 1.11.2.5 1999/07/12 19:29:37 perry Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -428,9 +428,10 @@
 }
 
 int
-write_mbr(disk, buf, len)
+write_mbr(disk, buf, len, convert)
        char *disk, *buf;
        int len;
+       int convert;
 {
        char diskpath[MAXPATHLEN];
        int fd, i, ret = 0;
@@ -462,12 +463,14 @@
                        psize = mbrp[i].mbrp_size;
                        mbrp[i].mbrp_start = native_to_le32(pstart);
                        mbrp[i].mbrp_size = native_to_le32(psize);
-                       convert_mbr_chs(bcyl, bhead, bsec,
-                           &mbrp[i].mbrp_scyl, &mbrp[i].mbrp_shd,
-                           &mbrp[i].mbrp_ssect, pstart);
-                       convert_mbr_chs(bcyl, bhead, bsec,
-                           &mbrp[i].mbrp_ecyl, &mbrp[i].mbrp_ehd,
-                           &mbrp[i].mbrp_esect, pstart + psize);
+                       if (convert) {
+                               convert_mbr_chs(bcyl, bhead, bsec,
+                                   &mbrp[i].mbrp_scyl, &mbrp[i].mbrp_shd,
+                                   &mbrp[i].mbrp_ssect, pstart);
+                               convert_mbr_chs(bcyl, bhead, bsec,
+                                   &mbrp[i].mbrp_ecyl, &mbrp[i].mbrp_ehd,
+                                   &mbrp[i].mbrp_esect, pstart + psize);
+                       }
                }
        }