[src/netbsd-1-6]: src/distrib Pull up revision 1.2 (requested by rafal in tic...

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

details:   https://anonhg.NetBSD.org/src/rev/3ccf1be57e0b
branches:  netbsd-1-6
changeset: 528456:3ccf1be57e0b
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Jul 19 01:41:09 2002 +0000

description:
Pull up revision 1.2 (requested by rafal in ticket #521):
Fix PR port-sgimips/17567: sysinst wasn't installing/upgrading bootblocks on
the new disk.  This requires my previous changes to sgivol to get a non-
interactive mode.  While here, change the way sysinst invoked sgivol (it
called system(), now it uses run_prog()) so we don't mess up the logging
and scripting contexts.

diffstat:

 distrib/sgimips/ramdisk/list            |   5 +++--
 distrib/utils/sysinst/arch/sgimips/md.c |  13 +++----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diffs (53 lines):

diff -r 2d12b37358a1 -r 3ccf1be57e0b distrib/sgimips/ramdisk/list
--- a/distrib/sgimips/ramdisk/list      Fri Jul 19 01:32:11 2002 +0000
+++ b/distrib/sgimips/ramdisk/list      Fri Jul 19 01:41:09 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list,v 1.1 2002/05/21 20:54:17 rafal Exp $
+#      $NetBSD: list,v 1.1.2.1 2002/07/19 01:41:09 lukem Exp $
 
 SRCDIRS        bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/sgimips/stand
 
@@ -47,7 +47,7 @@
 PROG   usr/bin/tip
 PROG   usr/bin/tset
 
-PROG   usr/mdec/installboot
+PROG   usr/mdec/sgivol
 
 PROG   usr/sbin/chown  usr/bin/chgrp
 PROG   usr/sbin/chroot
@@ -55,6 +55,7 @@
 # init invokes the shell as -sh
 ARGVLN sh -sh
 
+SPECIAL        sgivol  srcdir  sys/arch/sgimips/stand/sgivol
 SPECIAL        ping    srcdir  distrib/utils/x_ping
 
 LIBS   -ledit -lbz2 -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm
diff -r 2d12b37358a1 -r 3ccf1be57e0b distrib/utils/sysinst/arch/sgimips/md.c
--- a/distrib/utils/sysinst/arch/sgimips/md.c   Fri Jul 19 01:32:11 2002 +0000
+++ b/distrib/utils/sysinst/arch/sgimips/md.c   Fri Jul 19 01:41:09 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.1 2001/11/20 15:53:22 soren Exp $     */
+/*     $NetBSD: md.c,v 1.1.2.1 2002/07/19 01:41:19 lukem Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -103,15 +103,8 @@
 int
 md_post_disklabel(void)
 {
-       char sgivolcmd[256];
-       /* boot blocks ... */
-       sprintf(sgivolcmd, "/usr/mdec/sgivol -wqf boot /usr/mdec/boot %s", 
-                       diskdev);
-       printf(msg_string(MSG_dobootblks), diskdev);
-       do_system(sgivolcmd);
-       scripting_fprintf(log, "%s\n", sgivolcmd);
-
-       return 0;
+       return run_prog(RUN_DISPLAY, MSG_cmdfail,
+           "%s %s", "/usr/mdec/sgivol -f -w boot /usr/mdec/boot", diskdev);
 }
 
 int