diff options
| author | joerg <joerg@FreeBSD.org> | 1995-06-25 14:02:57 +0000 |
|---|---|---|
| committer | joerg <joerg@FreeBSD.org> | 1995-06-25 14:02:57 +0000 |
| commit | c54e2295b7f2db09802e0bc1874072840e4d75f7 (patch) | |
| tree | 11d2af9626479eeb2779d418af536370d62162a8 /sys/i386/boot/biosboot/table.c | |
| parent | adeb3e01da6a734bd8cba36acb8160a633948c35 (diff) | |
| download | FreeBSD-src-c54e2295b7f2db09802e0bc1874072840e4d75f7.zip FreeBSD-src-c54e2295b7f2db09802e0bc1874072840e4d75f7.tar.gz | |
Reset defaults in case of boot() is looping several times (e.g. the
user has entered a bogus kernel name in the first place).
Also fix the broken #ifdef FORCE_COMCONSOLE, it has been disabled by
accident. (NB: the keyboard probe remains disabled however.)
Few cosmetic fixes (declare functions to be void instead of int),
while i've been at this.
Pointed out by: wosch@cs.tu-berlin.de (Wolfram Schneider), for the init bug
Diffstat (limited to 'sys/i386/boot/biosboot/table.c')
| -rw-r--r-- | sys/i386/boot/biosboot/table.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/i386/boot/biosboot/table.c b/sys/i386/boot/biosboot/table.c index e9774f4..aa97789 100644 --- a/sys/i386/boot/biosboot/table.c +++ b/sys/i386/boot/biosboot/table.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:36:43 rpd - * $Id: table.c,v 1.6 1995/04/14 21:26:53 joerg Exp $ + * $Id: table.c,v 1.7 1995/05/30 07:58:36 rgrimes Exp $ */ /* @@ -137,5 +137,6 @@ struct pseudo_desc Idtr_real = { 0x400 - 1, 0x0, 0x0 }; * fragmentation. */ char *devs[] = { "wd", "hd", "fd", "wt", "sd", 0 }; -char *name = "/kernel"; +char dflname[] = "/kernel"; +char *name = dflname; unsigned long tw_chars = 0x5C2D2F7C; /* "\-/|" */ |
