diff options
| -rw-r--r-- | sys/i386/boot/biosboot/boot.c | 23 | ||||
| -rw-r--r-- | sys/i386/boot/boot.c | 23 |
2 files changed, 40 insertions, 6 deletions
diff --git a/sys/i386/boot/biosboot/boot.c b/sys/i386/boot/biosboot/boot.c index 2a6f533..c99b610 100644 --- a/sys/i386/boot/biosboot/boot.c +++ b/sys/i386/boot/biosboot/boot.c @@ -29,6 +29,12 @@ /* * HISTORY * $Log: boot.c,v $ + * Revision 1.4 1993/10/08 20:19:23 rgrimes + * Remove the ``loader overlaps bss, kernel must bzero'' printf since that + * is so often reported as an error condition when it is not. We print the + * size of things so for those who want to know if this happened they can + * figure it out from the size information that is printed. + * * Revision 1.3 1993/07/16 13:06:08 rgrimes * Changed header from 386BSD BOOT to FreeBSD BOOT. * @@ -137,7 +143,7 @@ int drive; ouraddr, argv[7] = memsize(0), argv[8] = memsize(1), - "$Revision: 1.3 $"); + "$Revision: 1.4 $"); printf("use options hd(1,...... to boot sd0 when wd0 is also installed\n"); gateA20(); loadstart: @@ -304,8 +310,19 @@ loadprog(howto) switch(maj) { case 2: - printf("\n\nInsert file system floppy \n"); - getchar(); + 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(); + switch (i) { + case '0': case 'A': case 'a': + unit = 0; + break; + case '1': case 'B': case 'b': + unit = 1; + break; + } + printf("\n"); break; case 4: break; diff --git a/sys/i386/boot/boot.c b/sys/i386/boot/boot.c index 2a6f533..c99b610 100644 --- a/sys/i386/boot/boot.c +++ b/sys/i386/boot/boot.c @@ -29,6 +29,12 @@ /* * HISTORY * $Log: boot.c,v $ + * Revision 1.4 1993/10/08 20:19:23 rgrimes + * Remove the ``loader overlaps bss, kernel must bzero'' printf since that + * is so often reported as an error condition when it is not. We print the + * size of things so for those who want to know if this happened they can + * figure it out from the size information that is printed. + * * Revision 1.3 1993/07/16 13:06:08 rgrimes * Changed header from 386BSD BOOT to FreeBSD BOOT. * @@ -137,7 +143,7 @@ int drive; ouraddr, argv[7] = memsize(0), argv[8] = memsize(1), - "$Revision: 1.3 $"); + "$Revision: 1.4 $"); printf("use options hd(1,...... to boot sd0 when wd0 is also installed\n"); gateA20(); loadstart: @@ -304,8 +310,19 @@ loadprog(howto) switch(maj) { case 2: - printf("\n\nInsert file system floppy \n"); - getchar(); + 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(); + switch (i) { + case '0': case 'A': case 'a': + unit = 0; + break; + case '1': case 'B': case 'b': + unit = 1; + break; + } + printf("\n"); break; case 4: break; |
