CVS commit: [netbsd-8] src/usr.sbin/sysinst/arch/sgimips

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Sun Sep 23 17:49:12 UTC 2018

Modified Files:
        src/usr.sbin/sysinst/arch/sgimips [netbsd-8]: md.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1032):

        usr.sbin/sysinst/arch/sgimips/md.c: revision 1.5
        usr.sbin/sysinst/arch/sgimips/md.c: revision 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.

 -

Fixes another part of port-sgimips/53583.
Should be pulled up (with rev 1.5) to netbsd-7 and netbsd-8.


To generate a diff of this commit:
cvs rdiff -u -r1.3.8.1 -r1.3.8.2 src/usr.sbin/sysinst/arch/sgimips/md.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.sbin/sysinst/arch/sgimips/md.c
diff -u src/usr.sbin/sysinst/arch/sgimips/md.c:1.3.8.1 src/usr.sbin/sysinst/arch/sgimips/md.c:1.3.8.2
--- src/usr.sbin/sysinst/arch/sgimips/md.c:1.3.8.1	Sun Mar 18 11:21:47 2018
+++ src/usr.sbin/sysinst/arch/sgimips/md.c	Sun Sep 23 17:49:12 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.3.8.1 2018/03/18 11:21:47 martin Exp $	*/
+/*	$NetBSD: md.c,v 1.3.8.2 2018/09/23 17:49:12 martin 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 @@ md_init(void)
 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 @@ md_pre_disklabel(void)
 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 @@ md_post_extract(void)
 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 @@ md_pre_update(void)
 int
 md_update(void)
 {
-	md_post_newfs();
+	md_post_disklabel();
 	return 1;
 }