d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Treat all options as toggles (ie. -c -c is the same no -c). Since

Browse Source 
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.
This commit is contained in:
Robert Nordier 1998-10-17 09:50:09 +00:00
parent 95242f5a02
commit 93d51dcaf9
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/boot/i386/boot2/boot2.c
View File

@ -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;

10
sys/boot/i386/gptboot/gptboot.c
View File

@ -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;