[src/netbsd-7]: src/usr.sbin/sysinst/arch/sgimips Pull up the following revis...

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

details:   https://anonhg.NetBSD.org/src/rev/5805fbe20093
branches:  netbsd-7
changeset: 445467:5805fbe20093
user:      sborrill <sborrill%NetBSD.org@localhost>
date:      Tue Oct 30 10:14:21 2018 +0000

description:
Pull up the following revisions(s) (requested by tsutsui in ticket #1640):
        usr.sbin/sysinst/arch/sgimips/md.c:     revision 1.5-1.6

PR port-sgimips/53583: fetch kernel name always before using it.
Make the struct utsname local to avoid future similar issues.
Make sure to install a bootloader even on upgrade installation.

diffstat:

 usr.sbin/sysinst/arch/sgimips/md.c |  17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diffs (68 lines):

diff -r 12515a061fd3 -r 5805fbe20093 usr.sbin/sysinst/arch/sgimips/md.c
--- a/usr.sbin/sysinst/arch/sgimips/md.c        Tue Oct 30 10:07:52 2018 +0000
+++ b/usr.sbin/sysinst/arch/sgimips/md.c        Tue Oct 30 10:14:21 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.2.4.2 2018/03/21 11:42:17 martin Exp $        */
+/*     $NetBSD: md.c,v 1.2.4.3 2018/10/30 10:14:21 sborrill Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -51,7 +51,6 @@
 #include "msg_defs.h"
 #include "menu_defs.h"
 
-struct utsname instsys;
 
 void
 md_init(void)
@@ -61,13 +60,15 @@
 void
 md_init_set_status(int flags)
 {
+       struct utsname instsys;
+
        (void)flags;
 
         /*
          * Get the name of the Install Kernel we are running under and
          * enable the installation of the corresponding GENERIC kernel.
          */
-        uname(&instsys);
+       uname(&instsys);
         if (strstr(instsys.version, "(INSTALL32_IP3x"))
                 set_kernel_set(SET_KERNEL_2);
         else if (strstr(instsys.version, "(INSTALL32_IP2x"))
@@ -156,7 +157,10 @@
 int
 md_post_disklabel(void)
 {
-    if (strstr(instsys.version, "(INSTALL32_IP3x"))
+       struct utsname instsys;
+       uname(&instsys);
+ 
+       if (strstr(instsys.version, "(INSTALL32_IP3x"))
                return run_program(RUN_DISPLAY,
                    "%s %s", "/usr/mdec/sgivol -f -w boot /usr/mdec/ip3xboot",
                    pm->diskdev);
@@ -194,9 +198,12 @@
 void
 md_cleanup_install(void)
 {
+       struct utsname instsys;
+
 #ifndef DEBUG
        enable_rc_conf();
 #endif
+       uname(&instsys);
 
        if (strstr(instsys.version, "(GENERIC32_IP12"))
                run_program(0, "/usr/mdec/sgivol -f -w netbsd %s %s",
@@ -213,7 +220,7 @@
 int
 md_update(void)
 {
-       md_post_newfs();
+       md_post_disklabel();
        return 1;
 }