diff options
| author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1994-10-26 13:46:34 +0000 |
|---|---|---|
| committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1994-10-26 13:46:34 +0000 |
| commit | 73ade464e2b8fed1e18ec6d9c4e6bb24aaad5695 (patch) | |
| tree | 9b61b42acc3f3e8ccc4766074b01423f672171fa | |
| parent | 67256b12347d0508df76751d5af0c4f642b9d3f6 (diff) | |
Notes
| -rw-r--r-- | sys/i386/boot/biosboot/boot.c | 25 | ||||
| -rw-r--r-- | sys/i386/boot/boot.c | 25 |
2 files changed, 4 insertions, 46 deletions
diff --git a/sys/i386/boot/biosboot/boot.c b/sys/i386/boot/biosboot/boot.c index c3bef8ba866b..3f2e0ea654d9 100644 --- a/sys/i386/boot/biosboot/boot.c +++ b/sys/i386/boot/biosboot/boot.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, [92/04/03 16:51:14 rvb] - * $Id: boot.c,v 1.16 1994/10/06 09:41:03 rgrimes Exp $ + * $Id: boot.c,v 1.17 1994/10/26 13:18:49 jkh Exp $ */ @@ -218,27 +218,6 @@ loadprog(howto) total = ((addr+sizeof(int)-1))&~(sizeof(int)-1); printf("total=0x%x ", total); - - /* - * If we are booting from floppy prompt for a filesystem floppy - * before we call the kernel - */ - switch(maj) - { - case 2: - printf("\n\nInsert file system floppy in drive A or B\n"); - printf("Press 'A', 'B' or any other key for the default "); - printf("%c: ", unit+'A'); - i = getchar(); - if (i=='0' || i=='A' || i=='a') - unit = 0; - if (i=='1' || i=='B' || i=='b') - unit = 1; - printf("\n"); - break; - case 4: - break; - } bootdev = (MAKEBOOTDEV(maj, 0, 0, unit, part)) ; /****************************************************************/ /* copy that first page and overwrite any BIOS variables */ @@ -259,7 +238,7 @@ getbootdev(howto) int *howto; { char c, *ptr = namebuf; - printf("Boot: [[[%s(%d,%c)]%s][-s][-a][-d]] :- " + printf("Boot: [[[%s(%d,%c)]%s][-s][-a][-c][-d][-f]] :- " , devs[maj] , unit , 'a'+part diff --git a/sys/i386/boot/boot.c b/sys/i386/boot/boot.c index c3bef8ba866b..3f2e0ea654d9 100644 --- a/sys/i386/boot/boot.c +++ b/sys/i386/boot/boot.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, [92/04/03 16:51:14 rvb] - * $Id: boot.c,v 1.16 1994/10/06 09:41:03 rgrimes Exp $ + * $Id: boot.c,v 1.17 1994/10/26 13:18:49 jkh Exp $ */ @@ -218,27 +218,6 @@ loadprog(howto) total = ((addr+sizeof(int)-1))&~(sizeof(int)-1); printf("total=0x%x ", total); - - /* - * If we are booting from floppy prompt for a filesystem floppy - * before we call the kernel - */ - switch(maj) - { - case 2: - printf("\n\nInsert file system floppy in drive A or B\n"); - printf("Press 'A', 'B' or any other key for the default "); - printf("%c: ", unit+'A'); - i = getchar(); - if (i=='0' || i=='A' || i=='a') - unit = 0; - if (i=='1' || i=='B' || i=='b') - unit = 1; - printf("\n"); - break; - case 4: - break; - } bootdev = (MAKEBOOTDEV(maj, 0, 0, unit, part)) ; /****************************************************************/ /* copy that first page and overwrite any BIOS variables */ @@ -259,7 +238,7 @@ getbootdev(howto) int *howto; { char c, *ptr = namebuf; - printf("Boot: [[[%s(%d,%c)]%s][-s][-a][-d]] :- " + printf("Boot: [[[%s(%d,%c)]%s][-s][-a][-c][-d][-f]] :- " , devs[maj] , unit , 'a'+part |