summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1999-06-02 06:59:42 +0000
committerRoland McGrath <roland@gnu.org>1999-06-02 06:59:42 +0000
commit4dba27b8807ab21411f2e8c0698a5f4a2f6c2858 (patch)
tree83101c2825442f1e47b98fed4b7d63be7bc11b5b
parent37b3644a7a96ce6b4b786c477c62523c9792ddbd (diff)
1999-06-02 Roland McGrath <roland@baalperazim.frob.com>
* init.c (frob_kernel_process): If no --kernel-command-line option, try `getenv ("MULTIBOOT_CMDLINE")' before defaulting to "(kernel)".
-rw-r--r--init/init.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/init/init.c b/init/init.c
index f217fca7..cb9b173d 100644
--- a/init/init.c
+++ b/init/init.c
@@ -71,10 +71,8 @@ int crash_flags = RB_AUTOBOOT;
/* Multiboot command line used to start the kernel,
- a single string of space-separated words.
- XXX should have an option passed from kernel/serverboot to set this
- */
-char *kernel_command_line = "(kernel)";
+ a single string of space-separated words. */
+char *kernel_command_line;
const char *argp_program_version = STANDARD_HURD_VERSION (init);
@@ -1226,6 +1224,9 @@ frob_kernel_process (void)
}
}
+ if (!kernel_command_line)
+ kernel_command_line = getenv ("MULTIBOOT_CMDLINE") ?: "(kernel)";
+
/* The variable `kernel_command_line' contains the multiboot command line
used to boot the kernel, a single string of space-separated words.