diff options
| author | rnordier <rnordier@FreeBSD.org> | 1998-10-17 09:50:09 +0000 |
|---|---|---|
| committer | rnordier <rnordier@FreeBSD.org> | 1998-10-17 09:50:09 +0000 |
| commit | 638a858945053dcef51905111b8c694e24477f0d (patch) | |
| tree | 71655341ac07071125df8dc37880ff120f2c2eba /sys/boot/i386/gptboot | |
| parent | 1be558ae51a3c6c5b108d0b9f235c554e6bc71d0 (diff) | |
| download | FreeBSD-src-638a858945053dcef51905111b8c694e24477f0d.zip FreeBSD-src-638a858945053dcef51905111b8c694e24477f0d.tar.gz | |
Treat all options as toggles (ie. -c -c is the same no -c). Since
the boot.config settings are persistent, this seems to provide a
useful override capability, and should break only on broken
boot.config's.
Output a cosmetic newline if booting with no input.
Diffstat (limited to 'sys/boot/i386/gptboot')
| -rw-r--r-- | sys/boot/i386/gptboot/gptboot.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c index 8c494c0..f24e19f 100644 --- a/sys/boot/i386/gptboot/gptboot.c +++ b/sys/boot/i386/gptboot/gptboot.c @@ -14,7 +14,7 @@ */ /* - * $Id: boot2.c,v 1.8 1998/10/17 09:01:13 rnordier Exp $ + * $Id: boot2.c,v 1.9 1998/10/17 09:16:01 rnordier Exp $ */ #include <sys/param.h> @@ -57,7 +57,6 @@ #define ARGS 0x800 #define NOPT 11 -#define XOPT 2 #define BSIZEMAX 8192 #define NDEV 5 #define MEM_BASE 0x12 @@ -184,6 +183,8 @@ main(void) sio_flush(); if (!autoboot || keyhit(0x5a)) getstr(cmd, sizeof(cmd)); + else + putchar('\n'); autoboot = helpon = 0; if (parse(cmd)) helpon = 1; @@ -320,10 +321,7 @@ parse(char *arg) for (i = 0; c != optstr[i]; i++) if (i == NOPT - 1) return -1; - if (i < XOPT) - opts ^= 1 << flags[i]; - else - opts |= 1 << flags[i]; + opts ^= 1 << flags[i]; } if (opts & 1 << RBX_PROBEKBD) { i = *(uint8_t *)PTOV(0x496) & 0x10; |
