Module Name: src
Committed By: martin
Date: Sat Sep 8 18:10:35 UTC 2018
Modified Files:
src/usr.sbin/sysinst/arch/sgimips: md.c
Log Message:
PR port-sgimips/53583: fetch kernel name always before using it.
Make the struct utsname local to avoid future similar issues.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.4 src/usr.sbin/sysinst/arch/sgimips/md.c:1.5
--- src/usr.sbin/sysinst/arch/sgimips/md.c:1.4 Sat Mar 17 22:27:04 2018
+++ src/usr.sbin/sysinst/arch/sgimips/md.c Sat Sep 8 18:10:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.4 2018/03/17 22:27:04 jmcneill Exp $ */
+/* $NetBSD: md.c,v 1.5 2018/09/08 18:10:35 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",
