diff options
| author | Roland McGrath <roland@gnu.org> | 2001-08-24 02:51:21 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2001-08-24 02:51:21 +0000 |
| commit | a561ea8cc43cbbaa5f3b0b9a94adf0e137905201 (patch) | |
| tree | a86e7fec4a169521d27bc253441012a8507312e9 | |
| parent | 1389661f58e2ad3bbff19b951612114ff8382b81 (diff) | |
2001-08-23 Roland McGrath <roland@frob.com>
* boot.c (kernel_command_line): New variable.
(options): Add --kernel-command-line/-K.
(parse_opt): Parse it, set kernel_command_line.
(main): If unset, default it to "argv[0] bootstrap_args bootdevice".
Set ${kernel-command-line} boot script variable to kernel_command_line.
| -rw-r--r-- | boot/boot.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/boot/boot.c b/boot/boot.c index bba51b0e..185952ae 100644 --- a/boot/boot.c +++ b/boot/boot.c @@ -1,6 +1,6 @@ /* Load a task using the single server, and then run it as if we were the kernel. - Copyright (C) 1993,94,95,96,97,98,99,2000 Free Software Foundation, Inc. + Copyright (C) 1993,94,95,96,97,98,99,2000,01 Free Software Foundation, Inc. This file is part of the GNU Hurd. @@ -76,6 +76,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ static struct termios orig_tty_state; static int isig; +static char *kernel_command_line; static void init_termstate () @@ -398,6 +399,8 @@ static struct argp_option options[] = "Root of a directory tree in which to find files specified in BOOT-SCRIPT" }, { "single-user", 's', 0, 0, "Boot in single user mode" }, + { "kernel-command-line", 'c', "COMMAND LINE", 0, + "Simulated multiboot command line to supply" }, { "pause" , 'd', 0, 0, "Pause for user confirmation at various times during booting" }, { "isig", 'I', 0, 0, @@ -414,6 +417,8 @@ parse_opt (int key, char *arg, struct argp_state *state) { size_t len; + case 'c': kernel_command_line = arg; break; + case 'D': useropen_dir = arg; break; case 'I': isig = 1; break; @@ -511,11 +516,17 @@ main (int argc, char **argv, char **envp) if (foo != MACH_PORT_NULL) mach_port_deallocate (mach_task_self (), foo); + if (kernel_command_line == 0) + asprintf (&kernel_command_line, "%s %s root=%s", + argv[0], bootstrap_args, bootdevice); + /* Initialize boot script variables. */ if (boot_script_set_variable ("host-port", VAL_PORT, (int) privileged_host_port) || boot_script_set_variable ("device-port", VAL_PORT, (int) pseudo_master_device_port) + || boot_script_set_variable ("kernel-command-line", VAL_STR, + (int) kernel_command_line) || boot_script_set_variable ("root-device", VAL_STR, (int) bootdevice) || boot_script_set_variable ("boot-args", VAL_STR, (int) bootstrap_args)) { |