[src/netbsd-1-4]: src/distrib/utils/sysinst/arch/sparc pullup 1.11->1.12 (abs)

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

details:   https://anonhg.NetBSD.org/src/rev/02d27d76ed25
branches:  netbsd-1-4
changeset: 468484:02d27d76ed25
user:      perry <perry%NetBSD.org@localhost>
date:      Mon Apr 26 16:22:48 1999 +0000

description:
pullup 1.11->1.12 (abs)

diffstat:

 distrib/utils/sysinst/arch/sparc/md.c |  16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diffs (39 lines):

diff -r 85b787721707 -r 02d27d76ed25 distrib/utils/sysinst/arch/sparc/md.c
--- a/distrib/utils/sysinst/arch/sparc/md.c     Mon Apr 26 16:21:43 1999 +0000
+++ b/distrib/utils/sysinst/arch/sparc/md.c     Mon Apr 26 16:22:48 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.8.2.1 1999/04/19 15:19:30 perry Exp $ */
+/*     $NetBSD: md.c,v 1.8.2.2 1999/04/26 16:22:48 perry Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -113,7 +113,7 @@
 int
 md_pre_disklabel()
 {
-       return 1;
+       return 0;
 }
 
 /*
@@ -133,15 +133,13 @@
  *
  * On the sparc, we use this opportunity to install the boot blocks.
  */
-void
+int
 md_post_newfs()
 {
-
-       printf(msg_string(MSG_dobootblks), diskdev);
-       if (run_prog(0, 1, NULL, "/sbin/disklabel -W %s", diskdev) != 0)
-               return 0;
-       run_prog(0, 1, NULL, "/usr/mdec/binstall ffs /mnt") ;
-       return 0;
+       /* boot blocks ... */
+       msg_display(MSG_dobootblks, diskdev);
+       return (run_prog(0, 1, NULL, "/sbin/disklabel -W %s", diskdev) ||
+               run_prog(0, 1, NULL, "/usr/mdec/binstall ffs /mnt"));
 }
 
 /*