diff options
| author | Roland McGrath <roland@gnu.org> | 2001-08-20 22:44:13 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2001-08-20 22:44:13 +0000 |
| commit | 316d5f8c58fb7ebc3d9ab31bfd2fde869ff80358 (patch) | |
| tree | ef469d36745d422f2a6987626ea8854edd526e4c /libdiskfs/diskfs.h | |
| parent | 273b1e42491dfd89c318b6dae43901f429d2b51e (diff) | |
| download | hurd-316d5f8c58fb7ebc3d9ab31bfd2fde869ff80358.tar.gz hurd-316d5f8c58fb7ebc3d9ab31bfd2fde869ff80358.tar.bz2 hurd-316d5f8c58fb7ebc3d9ab31bfd2fde869ff80358.zip | |
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.
* diskfs.h: Declare it.
* boot-start.c (diskfs_start_bootstrap, start_execserver): Use it.
* boot-start.c (diskfs_boot_init_program): New variable.
* diskfs.h: Declare it.
* boot-start.c (default_init): Variable removed.
(diskfs_start_bootstrap): Use diskfs_boot_init_program instead
of default_init or prompting under -i.
* opts-std-startup.c (OPT_BOOT_INIT_PROGRAM): New macro.
(startup_options): Add --boot-init-program.
(parse_startup_opt): Parse it.
Diffstat (limited to 'libdiskfs/diskfs.h')
| -rw-r--r-- | libdiskfs/diskfs.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/libdiskfs/diskfs.h b/libdiskfs/diskfs.h index c067f576..d32484da 100644 --- a/libdiskfs/diskfs.h +++ b/libdiskfs/diskfs.h @@ -149,10 +149,18 @@ extern mach_port_t diskfs_fsys_identity; file systems, to give the procserver. */ extern char **diskfs_argv; -/* When this is a bootstrap filesystem, the command line options passed from - the kernel. If not a bootstrap filesystem, it is 0, so it can be used to - distinguish between the two cases. */ -extern char *diskfs_boot_flags; +/* When this is a bootstrap filesystem, the multiboot kernel command line + passed from the kernel. If not a bootstrap filesystem, it is 0, so it + can be used to distinguish between the two cases. */ +extern const char *diskfs_boot_command_line; +#define diskfs_boot_filesystem() (diskfs_boot_command_line != 0) + +/* When this is a bootstrap filesystem, nonzero if starting each bootstrap + program should pause for a keystroke, for debugging purposes. */ +extern int _diskfs_boot_pause; + +/* Name of the init program run when this is a bootstrap filesystem. */ +extern const char *diskfs_boot_init_program; /* Hold this lock while do fsys level operations. Innocuous users can just hold a reader lock, and anyone who's going to do nasty things that would |