Module Name: src
Committed By: christos
Date: Fri Feb 14 16:04:44 UTC 2014
Modified Files:
src/sys/arch/mipsco/stand/common: boot.c
Log Message:
make sure kernel is initialized properly.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mipsco/stand/common/boot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mipsco/stand/common/boot.c
diff -u src/sys/arch/mipsco/stand/common/boot.c:1.9 src/sys/arch/mipsco/stand/common/boot.c:1.10
--- src/sys/arch/mipsco/stand/common/boot.c:1.9 Sat Jan 22 14:19:20 2011
+++ src/sys/arch/mipsco/stand/common/boot.c Fri Feb 14 11:04:44 2014
@@ -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 @@ main(int argc, char **argv)
--argc;
}
- }
+ } else
+ kernel = NULL;
+
if (dev == NULL) {
(void) devsplit(argv[0], bootname);
dev = bootname;
@@ -156,7 +158,7 @@ main(int argc, char **argv)
}
}
}
- if (!win)
+ if (!win || !kernel)
goto fail;
strncpy(bi_bpath.bootpath, kernel, BTINFO_BOOTPATH_LEN);
