[src/netbsd-9]: src/usr.sbin/sysinst/arch/landisk Pull up following revision(...

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

details:   https://anonhg.NetBSD.org/src/rev/0e3a017e3bbd
branches:  netbsd-9
changeset: 371764:0e3a017e3bbd
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Oct 04 17:14:08 2022 +0000

description:
Pull up following revision(s) (requested by martin in ticket #1535):
        usr.sbin/sysinst/arch/landisk/md.c: revision 1.16
PR install/57025: revert bogus rev 1.9 which was only papering over
a bug in the adoption of the MBR handling code and fix the original
conversion bug instead:
 - run fdisk to install the MBR bootcode on the raw disk partition
 - run installboot against the NetBSD root partition (not the raw partition).

diffstat:

 usr.sbin/sysinst/arch/landisk/md.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r a11522a47dad -r 0e3a017e3bbd usr.sbin/sysinst/arch/landisk/md.c
--- a/usr.sbin/sysinst/arch/landisk/md.c        Thu Sep 29 18:27:41 2022 +0000
+++ b/usr.sbin/sysinst/arch/landisk/md.c        Tue Oct 04 17:14:08 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.10.2.4 2022/02/02 04:25:39 msaitoh Exp $      */
+/*     $NetBSD: md.c,v 1.10.2.5 2022/10/04 17:14:08 snj Exp $  */
 
 /*
  * Copyright 1997,2002 Piermont Information Systems Inc.
@@ -130,7 +130,9 @@
            msg_string(parts->pscheme->short_name));
 
        /* write edited "MBR" onto disk. */
-       if (!parts->pscheme->write_to_disk(parts)) {
+       if (!parts->pscheme->write_to_disk(parts) ||
+           run_program(RUN_SILENT | RUN_ERROR_OK,
+           "/sbin/fdisk -f -i -c /usr/mdec/mbr %s", parts->disk)) {
                msg_display(MSG_wmbrfail);
                process_menu(MENU_ok, NULL);
                return false;
@@ -166,7 +168,7 @@
        bootxx = bootxx_name(install);
        if (bootxx != NULL) {
                error = run_program(RUN_DISPLAY,
-                   "/usr/sbin/installboot -v /dev/r%sd %s", pm->diskdev, bootxx);
+                   "/usr/sbin/installboot -v /dev/r%sa %s", pm->diskdev, bootxx);
                free(bootxx);
        } else
                error = -1;