diff options
| author | Steve Price <steve@FreeBSD.org> | 2000-12-11 02:22:36 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 2000-12-11 02:22:36 +0000 |
| commit | 53ad9271aa110fd911bd15a99055b1d60462f5ed (patch) | |
| tree | d7da2590fb57595fd139b69630f6b381ba802a7a /net/etherboot/files/patch-ab | |
| parent | 1f1e1cd7771e3f9198e7477a26c4b19bed15a60c (diff) | |
Update to version 4.6.10.
PR: 23095
Submitted by: maintainer
Diffstat (limited to 'net/etherboot/files/patch-ab')
| -rw-r--r-- | net/etherboot/files/patch-ab | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/net/etherboot/files/patch-ab b/net/etherboot/files/patch-ab index 328288314780..719016ea8870 100644 --- a/net/etherboot/files/patch-ab +++ b/net/etherboot/files/patch-ab @@ -1,19 +1,19 @@ -*** Config.orig Mon May 15 10:15:18 2000 ---- Config Mon May 15 10:16:04 2000 +*** main.c.orig Sun Oct 22 10:07:25 2000 +--- main.c Sun Oct 22 10:07:58 2000 *************** -*** 143,149 **** - # CFLAGS32+= -DCONSOLE_DUAL -DCOMCONSOLE=0x3f8 -DCONSPEED=9600 - - # Enable generic ELF, Multiboot ELF or FreeBSD ELF/a.out boot image support -! # CFLAGS32+= -DELF_IMAGE -DAOUT_IMAGE -DIMAGE_MULTIBOOT -DIMAGE_FREEBSD - - # Change download protocol to NFS. Only available for Etherboot/32 for now. - # CFLAGS32+= -DDOWNLOAD_PROTO_NFS ---- 143,149 ---- - # CFLAGS32+= -DCONSOLE_DUAL -DCOMCONSOLE=0x3f8 -DCONSPEED=9600 - - # Enable generic ELF, Multiboot ELF or FreeBSD ELF/a.out boot image support -! CFLAGS32+= -DELF_IMAGE -DAOUT_IMAGE -DIMAGE_MULTIBOOT -DIMAGE_FREEBSD - - # Change download protocol to NFS. Only available for Etherboot/32 for now. - # CFLAGS32+= -DDOWNLOAD_PROTO_NFS +*** 940,946 **** + memset(motd, 0, sizeof(motd)); + #endif + end_of_rfc1533 = NULL; +! vendorext_isvalid = 0; + if (memcmp(p, rfc1533_cookie, 4)) + return(0); /* no RFC 1533 header found */ + p += 4; +--- 940,946 ---- + memset(motd, 0, sizeof(motd)); + #endif + end_of_rfc1533 = NULL; +! vendorext_isvalid = 1; /* FreeBSD uses this field for swap */ + if (memcmp(p, rfc1533_cookie, 4)) + return(0); /* no RFC 1533 header found */ + p += 4; |