diff options
| author | Robert Nordier <rnordier@FreeBSD.org> | 1999-01-11 11:36:03 +0000 |
|---|---|---|
| committer | Robert Nordier <rnordier@FreeBSD.org> | 1999-01-11 11:36:03 +0000 |
| commit | 726c0943c03368d2b874318468cd774425a8de99 (patch) | |
| tree | 2327079169261fc30732df57a4f6566b50549feb | |
| parent | 10332f32276d5ab2e4ae3942b3949c2171b9041c (diff) | |
| download | src-726c0943c03368d2b874318468cd774425a8de99.tar.gz src-726c0943c03368d2b874318468cd774425a8de99.zip | |
Drop boot.help support.
Notes
Notes:
svn path=/head/; revision=42519
| -rw-r--r-- | sys/boot/i386/boot2/boot2.c | 15 | ||||
| -rw-r--r-- | sys/boot/i386/gptboot/gptboot.c | 15 |
2 files changed, 10 insertions, 20 deletions
diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c index 07bad96af78c..fa6058bcccb7 100644 --- a/sys/boot/i386/boot2/boot2.c +++ b/sys/boot/i386/boot2/boot2.c @@ -14,7 +14,7 @@ */ /* - * $Id: boot2.c,v 1.16 1998/11/08 18:37:28 rnordier Exp $ + * $Id: boot2.c,v 1.17 1999/01/10 13:29:52 peter Exp $ */ #include <sys/param.h> @@ -53,7 +53,6 @@ #define PATH_CONFIG "/boot.config" #define PATH_BOOT3 "/boot/loader" #define PATH_KERNEL "/kernel" -#define PATH_HELP "boot.help" #define ARGS 0x900 #define NOPT 11 @@ -103,7 +102,6 @@ static struct dsk { } dsk; static char cmd[512]; static char kname[1024]; -static char help[2048]; static uint32_t opts; static struct bootinfo bootinfo; static int ls; @@ -138,7 +136,7 @@ static int getc(int); int main(void) { - int autoboot, helpon, i; + int autoboot, i; v86.ctl = V86_FLAGS; dsk.drive = *(uint8_t *)PTOV(ARGS); @@ -153,8 +151,6 @@ main(void) for (i = 0; i < N_BIOS_GEOM; i++) bootinfo.bi_bios_geom[i] = drvinfo(i); autoboot = 2; - helpon = 1; - readfile(PATH_HELP, help, sizeof(help)); readfile(PATH_CONFIG, cmd, sizeof(cmd)); if (*cmd) { printf("%s: %s", PATH_CONFIG, cmd); @@ -176,19 +172,18 @@ main(void) for (;;) { printf(" \n>> FreeBSD/i386 BOOT\n" "Default: %u:%s(%u,%c)%s\n" - "%s" "boot: ", dsk.drive & DRV_MASK, dev_nm[dsk.type], dsk.unit, - 'a' + dsk.part, kname, helpon ? help : ""); + 'a' + dsk.part, kname); if (ioctrl & 0x2) sio_flush(); if (!autoboot || keyhit(0x5a)) getstr(cmd, sizeof(cmd)); else putchar('\n'); - autoboot = helpon = 0; + autoboot = 0; if (parse(cmd)) - helpon = 1; + putchar('\a'); else load(kname); } diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c index 07bad96af78c..fa6058bcccb7 100644 --- a/sys/boot/i386/gptboot/gptboot.c +++ b/sys/boot/i386/gptboot/gptboot.c @@ -14,7 +14,7 @@ */ /* - * $Id: boot2.c,v 1.16 1998/11/08 18:37:28 rnordier Exp $ + * $Id: boot2.c,v 1.17 1999/01/10 13:29:52 peter Exp $ */ #include <sys/param.h> @@ -53,7 +53,6 @@ #define PATH_CONFIG "/boot.config" #define PATH_BOOT3 "/boot/loader" #define PATH_KERNEL "/kernel" -#define PATH_HELP "boot.help" #define ARGS 0x900 #define NOPT 11 @@ -103,7 +102,6 @@ static struct dsk { } dsk; static char cmd[512]; static char kname[1024]; -static char help[2048]; static uint32_t opts; static struct bootinfo bootinfo; static int ls; @@ -138,7 +136,7 @@ static int getc(int); int main(void) { - int autoboot, helpon, i; + int autoboot, i; v86.ctl = V86_FLAGS; dsk.drive = *(uint8_t *)PTOV(ARGS); @@ -153,8 +151,6 @@ main(void) for (i = 0; i < N_BIOS_GEOM; i++) bootinfo.bi_bios_geom[i] = drvinfo(i); autoboot = 2; - helpon = 1; - readfile(PATH_HELP, help, sizeof(help)); readfile(PATH_CONFIG, cmd, sizeof(cmd)); if (*cmd) { printf("%s: %s", PATH_CONFIG, cmd); @@ -176,19 +172,18 @@ main(void) for (;;) { printf(" \n>> FreeBSD/i386 BOOT\n" "Default: %u:%s(%u,%c)%s\n" - "%s" "boot: ", dsk.drive & DRV_MASK, dev_nm[dsk.type], dsk.unit, - 'a' + dsk.part, kname, helpon ? help : ""); + 'a' + dsk.part, kname); if (ioctrl & 0x2) sio_flush(); if (!autoboot || keyhit(0x5a)) getstr(cmd, sizeof(cmd)); else putchar('\n'); - autoboot = helpon = 0; + autoboot = 0; if (parse(cmd)) - helpon = 1; + putchar('\a'); else load(kname); } |