diff options
| author | Roland McGrath <roland@gnu.org> | 2001-08-20 22:45:11 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2001-08-20 22:45:11 +0000 |
| commit | 7a6a676e8a7d79ed2ab83d3a68d1f9faa97d541f (patch) | |
| tree | c720269d6fdaa4d3fccef3403b8dab7cd966fb78 | |
| parent | 316d5f8c58fb7ebc3d9ab31bfd2fde869ff80358 (diff) | |
2001-08-20 Roland McGrath <roland@frob.com>
* opts-std-startup.c: diskfs_boot_flags -> diskfs_boot_command_line.
(OPT_BOOT_CMDLINE): Renamed from OPT_BOOTFLAGS.
(startup_options): --bootflags -> --multiboot-command-line
(parse_startup_opt): Parse it.
* diskfs.h: diskfs_boot_flags -> diskfs_boot_command_line.
(diskfs_boot_filesystem): New macro.
* init-main.c (diskfs_init_main): Use it.
* init-init.c (diskfs_init_diskfs): Likewise.
* console.c (diskfs_console_stdio): Likewise.
* boot-start.c (_diskfs_boot_privports): Likewise.
(diskfs_start_bootstrap): Split boot_command_line into words and pass
those arguments to init instead of diskfs_bootflags.
| -rw-r--r-- | libdiskfs/console.c | 7 | ||||
| -rw-r--r-- | libdiskfs/init-init.c | 2 | ||||
| -rw-r--r-- | libdiskfs/init-main.c | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/libdiskfs/console.c b/libdiskfs/console.c index a7113ace..a4c3a1af 100644 --- a/libdiskfs/console.c +++ b/libdiskfs/console.c @@ -1,8 +1,7 @@ /* Redirect stdio to the console if possible - Copyright (C) 1995, 96, 98, 99 Free Software Foundation, Inc. - - Written by Miles Bader <miles@gnu.ai.mit.edu> + Copyright (C) 1995,96,98,99,2001 Free Software Foundation, Inc. + Written by Miles Bader <miles@gnu.org> This file is part of the GNU Hurd. @@ -58,7 +57,7 @@ diskfs_console_stdio () { mach_port_t dev, cons; error_t err; - if (diskfs_boot_flags) + if (diskfs_boot_filesystem ()) _diskfs_boot_privports (); err = get_privileged_ports (NULL, &dev); assert_perror (err); diff --git a/libdiskfs/init-init.c b/libdiskfs/init-init.c index dc7ee2b2..cd0c1b29 100644 --- a/libdiskfs/init-init.c +++ b/libdiskfs/init-init.c @@ -57,7 +57,7 @@ diskfs_init_diskfs (void) { error_t err; - if (diskfs_boot_flags) + if (diskfs_boot_filesystem ()) /* This is a boot filesystem, we have to do some things specially. */ { mach_port_t host; diff --git a/libdiskfs/init-main.c b/libdiskfs/init-main.c index 98943189..16fdafa4 100644 --- a/libdiskfs/init-main.c +++ b/libdiskfs/init-main.c @@ -48,7 +48,7 @@ diskfs_init_main (struct argp *startup_argp, host priv ports are set for booting. */ diskfs_console_stdio (); - if (diskfs_boot_flags) + if (diskfs_boot_filesystem ()) /* We are the bootstrap filesystem. */ *bootstrap = MACH_PORT_NULL; else |