Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/mipsco/stand/common make sure kernel is initialized...



details:   https://anonhg.NetBSD.org/src/rev/9b101689a91c
branches:  trunk
changeset: 793454:9b101689a91c
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Feb 14 16:04:44 2014 +0000

description:
make sure kernel is initialized properly.

diffstat:

 sys/arch/mipsco/stand/common/boot.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r d2425389b56c -r 9b101689a91c sys/arch/mipsco/stand/common/boot.c
--- a/sys/arch/mipsco/stand/common/boot.c       Fri Feb 14 13:25:19 2014 +0000
+++ b/sys/arch/mipsco/stand/common/boot.c       Fri Feb 14 16:04:44 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot.c,v 1.9 2011/01/22 19:19:20 joerg Exp $   */
+/*     $NetBSD: boot.c,v 1.10 2014/02/14 16:04:44 christos Exp $       */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -133,7 +133,9 @@
                        --argc;
                }
 
-       }
+       } else
+               kernel = NULL;
+
        if (dev == NULL) {
                (void) devsplit(argv[0], bootname);
                dev = bootname;
@@ -156,7 +158,7 @@
                        }
                }
        }
-       if (!win)
+       if (!win || !kernel)
                goto fail;
 
        strncpy(bi_bpath.bootpath, kernel, BTINFO_BOOTPATH_LEN);



Home | Main Index | Thread Index | Old Index