[src/trunk]: src/usr.sbin/installboot/arch `-b bno' isn't supported. (sync w...

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

details:   https://anonhg.NetBSD.org/src/rev/b1b0e30c32cf
branches:  trunk
changeset: 526948:b1b0e30c32cf
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue May 14 15:29:50 2002 +0000

description:
`-b bno' isn't supported.  (sync with similar fix in arch/sparc.c)

diffstat:

 usr.sbin/installboot/arch/sun68k.c |  18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diffs (49 lines):

diff -r 45d9bfac030d -r b1b0e30c32cf usr.sbin/installboot/arch/sun68k.c
--- a/usr.sbin/installboot/arch/sun68k.c        Tue May 14 15:08:26 2002 +0000
+++ b/usr.sbin/installboot/arch/sun68k.c        Tue May 14 15:29:50 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sun68k.c,v 1.13 2002/05/14 06:40:33 lukem Exp $ */
+/*     $NetBSD: sun68k.c,v 1.14 2002/05/14 15:29:50 lukem Exp $ */
 
 /*-
  * Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: sun68k.c,v 1.13 2002/05/14 06:40:33 lukem Exp $");
+__RCSID("$NetBSD: sun68k.c,v 1.14 2002/05/14 15:29:50 lukem Exp $");
 #endif /* !__lint */
 
 #if HAVE_CONFIG_H
@@ -119,7 +119,7 @@
        size_t          bbi;
        struct sun68k_bbinfo    *bbinfop;       /* bbinfo in prototype image */
        uint32_t        maxblk, nblk, blk_i;
-       ib_block        *blocks = NULL;
+       ib_block        *blocks;
 
        assert(params != NULL);
        assert(params->fsfd != -1);
@@ -129,12 +129,18 @@
        assert(params->stage1 != NULL);
        assert(SUN68K_BBINFO_MAGICSIZE == 32);
 
+       retval = 0;
+       blocks = NULL;
+
        if (params->stage2 == NULL) {
                warnx("You must provide the name of the secondary bootstrap");
-               return (0);
+               goto done;
        }
-
-       retval = 0;
+       if (params->flags & IB_STAGE1START) {
+               warnx("`-b bno' is not supported for %s",
+                   params->machine->name);
+               goto done;
+       }
 
        if (fstat(params->fsfd, &filesystemsb) == -1) {
                warn("Examining `%s'", params->filesystem);