[src/netbsd-1-6]: src/distrib/utils/sysinst/arch/sparc64 Pullup hand patch (r...

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

details:   https://anonhg.NetBSD.org/src/rev/3e6fa844c16b
branches:  netbsd-1-6
changeset: 531044:3e6fa844c16b
user:      jmc <jmc%NetBSD.org@localhost>
date:      Wed Dec 24 04:37:44 2003 +0000

description:
Pullup hand patch (requested by martin in ticket #1572)
When upgrading an old system, install new bootblocks too. PR#17204

diffstat:

 distrib/utils/sysinst/arch/sparc64/md.c |  21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diffs (48 lines):

diff -r 22f6bbf0cb73 -r 3e6fa844c16b distrib/utils/sysinst/arch/sparc64/md.c
--- a/distrib/utils/sysinst/arch/sparc64/md.c   Wed Dec 24 04:35:02 2003 +0000
+++ b/distrib/utils/sysinst/arch/sparc64/md.c   Wed Dec 24 04:37:44 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.8 2001/01/14 02:38:22 mrg Exp $       */
+/*     $NetBSD: md.c,v 1.8.2.1 2003/12/24 04:37:44 jmc Exp $   */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -161,13 +161,25 @@
        return check_partitions();
 }
 
+/* install/update bootblocks */
+static void
+install_bootblocks(void)
+{
+
+       /* Install boot blocks now that we have a full system ... */       
+       msg_display(MSG_dobootblks, diskdev);
+       run_prog(RUN_DISPLAY, NULL, "/sbin/disklabel -W %s", diskdev);
+       run_prog(RUN_DISPLAY, NULL, "/usr/mdec/binstall ffs %s", targetroot_mnt);
+}
+
 /* Upgrade support */
 int
 md_update(void)
 {
-       endwin();
+       /* endwin(); */
        md_copy_filesystem();
        md_post_newfs();
+       install_bootblocks();
        wrefresh(curscr);
        wmove(stdscr, 0, 0);
        wclear(stdscr);
@@ -182,10 +194,7 @@
        char realto[STRSIZE];
        char sedcmd[STRSIZE];
 
-       /* Install boot blocks now that we have a full system ... */
-       msg_display(MSG_dobootblks, diskdev);
-       run_prog(RUN_DISPLAY, NULL, "/sbin/disklabel -W %s", diskdev);
-       run_prog(RUN_DISPLAY, NULL, "/usr/mdec/binstall ffs %s", targetroot_mnt);
+       install_bootblocks();
 
        strncpy(realfrom, target_expand("/etc/rc.conf"), STRSIZE);
        strncpy(realto, target_expand("/etc/rc.conf.install"), STRSIZE);