Module Name: src
Committed By: phx
Date: Sun Mar 20 02:07:05 UTC 2011
Modified Files:
src/sys/arch/sandpoint/stand/altboot: main.c
Log Message:
The DSM-G600 U-Boot is so restricted that there is no possibility to pass
any bootargs. So we will just do the default multiuser boot from wd0: when
altboot was started together with a Linux initrd image.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sandpoint/stand/altboot/main.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/sandpoint/stand/altboot/main.c
diff -u src/sys/arch/sandpoint/stand/altboot/main.c:1.12 src/sys/arch/sandpoint/stand/altboot/main.c:1.13
--- src/sys/arch/sandpoint/stand/altboot/main.c:1.12 Sun Mar 13 15:23:43 2011
+++ src/sys/arch/sandpoint/stand/altboot/main.c Sun Mar 20 02:07:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.12 2011/03/13 15:23:43 phx Exp $ */
+/* $NetBSD: main.c,v 1.13 2011/03/20 02:07:05 phx Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -184,10 +184,18 @@
* "bootm".
*/
if (argc > MAX_ARGS) {
- /* parse Linux bootargs */
- argv = new_argv;
- argc = parse_cmdline(argv, MAX_ARGS, bootargs_start,
- bootargs_end);
+ if (argv != NULL) {
+ /*
+ * initrd image was loaded: assume extremely
+ * restricted firmware and boot default
+ */
+ argc = 0;
+ } else {
+ /* parse standard Linux bootargs */
+ argc = parse_cmdline(new_argv, MAX_ARGS,
+ bootargs_start, bootargs_end);
+ argv = new_argv;
+ }
}
/* wait 2s for user to enter interactive mode */
