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

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

details:   https://anonhg.NetBSD.org/src/rev/67e6c18bd6e8
branches:  netbsd-8
changeset: 434761:67e6c18bd6e8
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Mar 18 11:21:47 2018 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #643):
        usr.sbin/sysinst/arch/sgimips/md.c: revision 1.4
Official builds now append a timestamp to the kernel config name, so we
can no longer rely on matching an exact name like "(INSTALL32_IP3x)".
Strip the trailing ) from the version strings checked so sysinst will
install the correct bootloader and kernel again.

diffstat:

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

diffs (48 lines):

diff -r b16f3875e240 -r 67e6c18bd6e8 usr.sbin/sysinst/arch/sgimips/md.c
--- a/usr.sbin/sysinst/arch/sgimips/md.c        Sun Mar 18 11:08:04 2018 +0000
+++ b/usr.sbin/sysinst/arch/sgimips/md.c        Sun Mar 18 11:21:47 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.3 2015/01/02 19:43:13 abs Exp $       */
+/*     $NetBSD: md.c,v 1.3.8.1 2018/03/18 11:21:47 martin Exp $        */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -68,11 +68,11 @@
          * enable the installation of the corresponding GENERIC kernel.
          */
         uname(&instsys);
-        if (strstr(instsys.version, "(INSTALL32_IP3x)"))
+        if (strstr(instsys.version, "(INSTALL32_IP3x"))
                 set_kernel_set(SET_KERNEL_2);
-        else if (strstr(instsys.version, "(INSTALL32_IP2x)"))
+        else if (strstr(instsys.version, "(INSTALL32_IP2x"))
                 set_kernel_set(SET_KERNEL_1);
-       else if (strstr(instsys.version, "(GENERIC32_IP12)"))
+       else if (strstr(instsys.version, "(GENERIC32_IP12"))
                set_kernel_set(SET_KERNEL_3);
 }
 
@@ -156,12 +156,12 @@
 int
 md_post_disklabel(void)
 {
-    if (strstr(instsys.version, "(INSTALL32_IP3x)"))
+    if (strstr(instsys.version, "(INSTALL32_IP3x"))
                return run_program(RUN_DISPLAY,
                    "%s %s", "/usr/mdec/sgivol -f -w boot /usr/mdec/ip3xboot",
                    pm->diskdev);
 
-       if (strstr(instsys.version, "(INSTALL32_IP2x)")) {
+       if (strstr(instsys.version, "(INSTALL32_IP2x")) {
                run_program(RUN_DISPLAY,
                  "%s %s", "/usr/mdec/sgivol -f -w aoutboot /usr/mdec/aoutboot",
                  pm->diskdev);
@@ -198,7 +198,7 @@
        enable_rc_conf();
 #endif
 
-       if (strstr(instsys.version, "(GENERIC32_IP12)"))
+       if (strstr(instsys.version, "(GENERIC32_IP12"))
                run_program(0, "/usr/mdec/sgivol -f -w netbsd %s %s",
                            target_expand("/netbsd.ecoff"), pm->diskdev);
 }