Attachment 2247 Details for Bug 7098 – file.diff

[patch] file.diff

file.diff (text/plain), 1.47 KB, created by iedowse on 1998-06-28 17:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: iedowse

Created: 1998-06-28 17:30:01 UTC

Size: 1.47 KB

patch

obsolete

>diff -c ../netboot.old/Makefile ./Makefile
>*** ../netboot.old/Makefile	Sat Mar  7 11:20:13 1998
>--- ./Makefile	Sun Jun 28 15:46:19 1998
>***************
>*** 3,8 ****
>--- 3,9 ----
>  # Makefile for NETBOOT
>  #
>  # Basic Options:
>+ #	-DSECURE_BOOT	- Disable 'boot>' prompt completely
>  #	-DASK_BOOT	- Ask "Boot from Network (Y/N) ?" at startup
>  #	-DROMSIZE	- Size of EPROM - Must be set (even for .COM files)
>  #	-DRELOC		- Relocation address (usually 0x90000)
>diff -c ../netboot.old/bootmenu.c ./bootmenu.c
>*** ../netboot.old/bootmenu.c	Wed May 14 03:44:26 1997
>--- ./bootmenu.c	Sun Jun 28 03:41:20 1998
>***************
>*** 327,332 ****
>--- 338,355 ----
>  {
>  	char cmd[80];
>  	int ptr, c;
>+ #ifdef SECURE_BOOT
>+ 	char *p;
>+ 
>+ 	printf("\r\n");
>+ 
>+ 	printf("Press any key to retry:");
>+ 	while (iskey())
>+ 		getchar();
>+ 	getchar();
>+ 	printf("\r\n");
>+ 	eth_probe();
>+ #else
>  	printf("\r\n");
>  	while (1) {
>  		ptr = 0;
>***************
>*** 349,353 ****
>--- 372,377 ----
>  		printf("\r\n");
>  		if (execute(cmd)) break;
>  	}
>+ #endif
>  	eth_reset();
>  }
>diff -c ../netboot.old/main.c ./main.c
>*** ../netboot.old/main.c	Sun Jan 18 23:16:27 1998
>--- ./main.c	Sun Jun 28 02:59:50 1998
>***************
>*** 343,349 ****
>--- 343,351 ----
>  **************************************************************************/
>  pollkbd()
>  {
>+ #ifndef SECURE_BOOT
>  	if (iskey() && (getchar() == ESC)) longjmp(jmp_bootmenu,1);
>+ #endif
>  }
>  
>  /**************************************************************************

Actions: View | Diff

Attachments on bug 7098: 2245 | 2246 | 2247 | 2248 | 2249 | 2250