diff options
| -rw-r--r-- | adv.inc | 456 | ||||
| -rw-r--r-- | com32/include/syslinux/adv.h | 53 | ||||
| -rw-r--r-- | com32/lib/Makefile | 4 | ||||
| -rw-r--r-- | com32/lib/syslinux/adv.c | 49 | ||||
| -rw-r--r-- | com32/lib/syslinux/advwrite.c | 45 | ||||
| -rw-r--r-- | com32/samples/Makefile | 1 | ||||
| -rw-r--r-- | com32/samples/advdump.c | 53 | ||||
| -rw-r--r-- | comboot.doc | 24 | ||||
| -rw-r--r-- | comboot.inc | 17 | ||||
| -rw-r--r-- | extlinux.asm | 5 | ||||
| -rw-r--r-- | isolinux.asm | 1 | ||||
| -rw-r--r-- | layout.inc | 2 | ||||
| -rw-r--r-- | ldlinux.asm | 13 | ||||
| -rw-r--r-- | pxelinux.asm | 1 | ||||
| -rw-r--r-- | ui.inc | 2 |
15 files changed, 711 insertions, 15 deletions
diff --git a/adv.inc b/adv.inc new file mode 100644 index 00000000..19ea45fa --- /dev/null +++ b/adv.inc @@ -0,0 +1,456 @@ +;; ----------------------------------------------------------------------- +;; +;; Copyright 2007 H. Peter Anvin - All Rights Reserved +;; +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, Inc., 53 Temple Place Ste 330, +;; Boston MA 02111-1307, USA; either version 2 of the License, or +;; (at your option) any later version; incorporated herein by reference. +;; +;; ----------------------------------------------------------------------- + +;; +;; adv.inc +;; +;; The auxillary data vector and its routines +;; +;; The auxillary data vector is a 512-byte aligned block that on the +;; disk-based derivatives can be part of the syslinux file itself. It +;; exists in two copies; when written, both copies are written (with a +;; sync in between, if from the operating system.) The first two +;; dwords are magic number and inverse checksum, then follows the data +;; area as a tagged array similar to BOOTP/DHCP, finally a tail +;; signature. +;; +;; Note that unlike BOOTP/DHCP, zero terminates the chain, and FF +;; has no special meaning. +;; + +ADV_MAGIC1 equ 0x5a2d2fa5 ; Head signature +ADV_MAGIC2 equ 0xa3041767 ; Total checksum +ADV_MAGIC3 equ 0xdd28bf64 ; Tail signature + +ADV_LEN equ 500 ; Data bytes + +adv_retries equ 6 ; Disk retries + + section .adv + ; Introduce the ADVs to valid but blank +adv0: +.head dd ADV_MAGIC1 +.csum dd ADV_MAGIC2 +.data times ADV_LEN db 0 +.tail dd ADV_MAGIC3 +.end +adv1: +.head dd ADV_MAGIC1 +.csum dd ADV_MAGIC2 +.data times ADV_LEN db 0 +.tail dd ADV_MAGIC3 +.end + section .text + + ; + ; This is called after config file parsing, so we know + ; the intended location of the ADV + ; +adv_init: + cmp dword [ADVSec0],0 + jne adv_read + + ; Here, poke the proper values of ADVSec0, 1 + ; based on the position of the syslinux file + + ; ** fall through to adv_verify ** + + ; + ; Initialize the ADV data structure in memory + ; +adv_verify: + mov si,adv0 + call .check_adv + jz .ok ; Primary ADV okay + mov si,adv1 + call .check_adv + jz .adv1ok + + ; Neither ADV is usable; initialize to blank + mov si,adv0 + mov eax,ADV_MAGIC1 + stosd + mov eax,ADV_MAGIC2 + stosd + xor eax,eax + mov cx,ADV_LEN/4 + rep stosd + mov eax,ADV_MAGIC3 + stosd + +.ok: + ret + + ; The primary ADV is bad, but the backup is OK +.adv1ok: + mov di,adv0 + mov cx,512/4 + rep movsd + ret + + + ; SI points to the putative ADV; unchanged by routine + ; ZF=1 on return if good +.check_adv: + push si + lodsd + cmp eax,ADV_MAGIC1 + jne .done ; ZF=0, i.e. bad + xor edx,edx + mov cx,ADV_LEN/4+1 ; Remaining dwords +.csum: + lodsd + add edx,eax + loop .csum + cmp edx,ADV_MAGIC2 + jne .done + lodsd + cmp eax,ADV_MAGIC3 +.done: + pop si + ret + +; +; adv_get: find an ADV string if present +; +; Input: DL = ADV ID +; Output: CX = byte count (zero on not found) +; SI = pointer to data +; DL = unchanged +; +; Assumes CS == DS. +; + +adv_get: + push ax + mov si,adv0.data + xor ax,ax ; Keep AH=0 at all times +.loop: + lodsb ; Read ID + cmp al,dl + je .found + and al,al + jz .end + lodsb ; Read length + add si,ax + cmp si,adv0.tail + jb .loop + jmp .end + +.found: + lodsb + mov cx,ax + add ax,si ; Make sure it fits + cmp ax,adv0.tail + jbe .ok +.end: + xor cx,cx +.ok: + pop ax + ret + +; +; adv_set: insert a string into the ADV in memory +; +; Input: DL = ADV ID +; FS:BX = input buffer +; CX = byte count (max = 255!) +; Output: CF=1 on error +; CX clobbered +; +; Assumes CS == DS == ES. +; +adv_set: + push ax + push si + push di + and ch,ch + jnz .overflow + + push cx + mov si,adv0.data + xor ax,ax +.loop: + lodsb + cmp al,dl + je .found + and al,al + jz .endz + lodsb + add si,ax + cmp si,adv0.tail + jb .loop + jmp .end + +.found: ; Found, need to delete old copy + lodsb + lea di,[si-2] + push di + add si,ax + mov cx,adv0.tail + sub cx,si + jb .nukeit + rep movsb ; Remove the old one + mov [di],ah ; Termination zero + pop si + jmp .loop +.nukeit: + pop si + jmp .end +.endz: + dec si +.end: + ; Now SI points to where we want to put our data + pop cx + mov di,si + jcxz .empty + add si,cx + cmp si,adv0.tail-2 + jae .overflow ; CF=0 + + mov si,bx + mov al,dl + stosb + mov al,cl + stosb + fs rep movsb + +.empty: + mov cx,adv0.tail + sub cx,di + xor ax,ax + rep stosb ; Zero-fill remainder + + clc +.done: + pop di + pop si + pop ax + ret +.overflow: + stc + jmp .done + +; +; adv_cleanup: checksum adv0 and copy to adv1 +; Assumes CS == DS == ES. +; +adv_cleanup: + pushad + mov si,adv0.data + mov cx,ADV_LEN/4 + xor edx,edx +.loop: + lodsd + add edx,eax + loop .loop + mov eax,ADV_MAGIC2 + sub eax,edx + lea di,[si+4] ; adv1 + mov si,adv0 + mov [si+4],eax ; Store checksum + mov cx,(ADV_LEN+12)/4 + rep movsd + popad + ret + +; +; adv_write: write the ADV to disk. +; +; Location is in memory variables. +; Assumes CS == DS == ES. +; +; Returns CF=1 if the ADV cannot be written. +; +adv_write: + cmp dword [ADVSec0],0 + je .bad + cmp dword [ADVSec1],0 + je .bad + push ax + call adv_cleanup + mov ah,3 ; Write + call adv_read_write + pop ax + clc + ret +.bad: ; No location for ADV set + stc + ret + +; +; adv_read: read the ADV from disk +; +; Location is in memory variables. +; Assumes CS == DS == ES. +; +adv_read: + push ax + mov ah,2 ; Read + call adv_read_write + call adv_verify + pop ax + ret + +; +; adv_read_write: disk I/O for the ADV +; +; On input, AH=2 for read, AH=3 for write. +; Assumes CS == DS == ES. +; +adv_read_write: + mov [ADVOp],ah + pushad + + mov dl,[ADVDrive] + and dl,dl + ; Floppies: can't trust INT 13h 08h, we better know + ; the geometry a priori, which means it better be our + ; boot device. Handle that later. + ; jns .floppy ; Floppy drive... urk + + mov ah,08h ; Get disk parameters + int 13h + jc .noparm + and ah,ah + jnz .noparm + shr dx,8 + inc dx + mov [ADVHeads],dx + and cx,3fh + mov [ADVSecPerTrack],cx + +.noparm: + ; Check for EDD + mov bx,55AAh + mov ah,41h ; EDD existence query + mov dl,[ADVDrive] + int 13h + mov si,.cbios + jc .noedd + mov si,.ebios +.noedd: + + mov eax,[ADVSec0] + mov bx,adv0 + call .doone + + mov eax,[ADVSec1] + mov bx,adv1 + call .doone + + popad + ret + +.doone: + xor edx,edx ; Zero-extend LBA + push si + jmp si + +.ebios: + mov cx,adv_retries +.eb_retry: + ; Form DAPA on stack + push edx + push eax + push es + push bx + push word 1 ; Sector count + push word 16 ; DAPA size + mov si,sp + pushad + mov dl,[ADVDrive] + mov ax,4080h + or ah,[ADVOp] + push ds + push ss + pop ds + int 13h + pop ds + popad + lea sp,[si+16] ; Remove DAPA + jc .eb_error + pop si + ret +.eb_error: + loop .eb_retry + stc + pop si + ret + +.cbios: + push edx + push eax + push bp + + movzx esi,word [ADVSecPerTrack] + movzx edi,word [ADVHeads] + ; + ; Dividing by sectors to get (track,sector): we may have + ; up to 2^18 tracks, so we need to use 32-bit arithmetric. + ; + div esi + xor cx,cx + xchg cx,dx ; CX <- sector index (0-based) + ; EDX <- 0 + ; eax = track # + div edi ; Convert track to head/cyl + + ; Watch out for overflow, we might be writing! + cmp eax,1023 + ja .cb_overflow + + ; + ; Now we have AX = cyl, DX = head, CX = sector (0-based), + ; BP = sectors to transfer, SI = bsSecPerTrack, + ; ES:BX = data target + ; + + shl ah,6 ; Because IBM was STOOPID + ; and thought 8 bits were enough + ; then thought 10 bits were enough... + inc cx ; Sector numbers are 1-based, sigh + or cl,ah + mov ch,al + mov dh,dl + mov dl,[ADVDrive] + xchg ax,bp ; Sector to transfer count + mov ah,[ADVOp] ; Operation + + mov bp,adv_retries +.cb_retry: + pushad + int 13h + popad + jc .cb_error + +.cb_done: + pop bp + pop eax + pop edx + ret + +.cb_error: + dec bp + jnz .cb_retry +.cb_overflow: + stc + jmp .cb_done + + section .data + align 4, db 0 +ADVSec0 dd 1 +ADVSec1 dd 2 +ADVSecPerTrack dw 0 +ADVHeads dw 0 +ADVDrive db 80h +ADVOp db 0 diff --git a/com32/include/syslinux/adv.h b/com32/include/syslinux/adv.h new file mode 100644 index 00000000..9af80ba0 --- /dev/null +++ b/com32/include/syslinux/adv.h @@ -0,0 +1,53 @@ +/* ----------------------------------------------------------------------- * + * + * Copyright 2007 H. Peter Anvin - All Rights Reserved + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom + * the Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall + * be included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * ----------------------------------------------------------------------- */ + +/* + * syslinux/adv.h + */ + +#ifndef _SYSLINUX_ADV_H +#define _SYSLINUX_ADV_H + +#include <klibc/extern.h> +#include <stddef.h> + +__extern void *__syslinux_adv_ptr; +__extern size_t __syslinux_adv_size; + +static inline void *syslinux_adv_ptr(void) +{ + return __syslinux_adv_ptr; +} + +static inline size_t syslinux_adv_size(void) +{ + return __syslinux_adv_size; +} + +__extern int syslinux_adv_write(void); + +#endif /* _SYSLINUX_ADV_H */ diff --git a/com32/lib/Makefile b/com32/lib/Makefile index 1cde067d..314b8475 100644 --- a/com32/lib/Makefile +++ b/com32/lib/Makefile @@ -81,7 +81,9 @@ LIBOBJS = \ syslinux/initramfs_file.o syslinux/initramfs_loadfile.o \ syslinux/initramfs_archive.o \ \ - syslinux/pxe_get_cached.o + syslinux/pxe_get_cached.o \ + \ + syslinux/adv.o syslinux/advwrite.o BINDIR = /usr/bin LIBDIR = /usr/lib diff --git a/com32/lib/syslinux/adv.c b/com32/lib/syslinux/adv.c new file mode 100644 index 00000000..75aab2cf --- /dev/null +++ b/com32/lib/syslinux/adv.c @@ -0,0 +1,49 @@ +/* ----------------------------------------------------------------------- * + * + * Copyright 2007 H. Peter Anvin - All Rights Reserved + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom + * the Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall + * be included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * ----------------------------------------------------------------------- */ + +/* + * syslinux/adv.h + * + * Access the syslinux auxilliary data vector + */ + +#include <syslinux/adv.h> +#include <klibc/compiler.h> +#include <com32.h> + +void *__syslinux_adv_ptr; +size_t __syslinux_adv_size; + +void __constructor __syslinux_get_adv(void) +{ + static com32sys_t reg; + + reg.eax.w[0] = 0x001c; + __intcall(0x22, ®, ®); + __syslinux_adv_ptr = MK_PTR(reg.es, reg.ebx.w[0]); + __syslinux_adv_size = reg.ecx.w[0]; +} diff --git a/com32/lib/syslinux/advwrite.c b/com32/lib/syslinux/advwrite.c new file mode 100644 index 00000000..1fe26b4e --- /dev/null +++ b/com32/lib/syslinux/advwrite.c @@ -0,0 +1,45 @@ +/* ----------------------------------------------------------------------- * + * + * Copyright 2007 H. Peter Anvin - All Rights Reserved + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom + * the Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall + * be included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * ----------------------------------------------------------------------- */ + +/* + * syslinux/advwrite.c + * + * Write back the ADV + */ + +#include <syslinux/adv.h> +#include <klibc/compiler.h> +#include <com32.h> + +int syslinux_adv_write(void) +{ + static com32sys_t reg; + + reg.eax.w[0] = 0x001d; + __intcall(0x22, ®, ®); + return (reg.eflags.l & EFLAGS_CF) ? -1 : 0; +} diff --git a/com32/samples/Makefile b/com32/samples/Makefile index e14e08f1..197e9114 100644 --- a/com32/samples/Makefile +++ b/com32/samples/Makefile @@ -45,6 +45,7 @@ all: hello.c32 cat.c32 resolv.c32 vesainfo.c32 serialinfo.c32 \ localboot.c32 \ fancyhello.c32 fancyhello.lnx \ keytest.c32 keytest.lnx \ + advdump.c32 .PRECIOUS: %.o %.o: %.S diff --git a/com32/samples/advdump.c b/com32/samples/advdump.c new file mode 100644 index 00000000..f50401b9 --- /dev/null +++ b/com32/samples/advdump.c @@ -0,0 +1,53 @@ +/* ----------------------------------------------------------------------- * + * + * Copyright 2007 H. Peter Anvin - All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, Inc., 53 Temple Place Ste 330, + * Boston MA 02111-1307, USA; either version 2 of the License, or + * (at your option) any later version; incorporated herein by reference. + * + * ----------------------------------------------------------------------- */ + +/* + * advdump.c + * + * Dump the contents of the syslinux ADV + */ + +#include <stdio.h> +#include <console.h> +#include <syslinux/adv.h> +#include <string.h> + +int main(void) +{ + uint8_t *p, *ep; + size_t s = syslinux_adv_size(); + char buf[256]; + + openconsole(&dev_stdcon_r, &dev_stdcon_w); + + p = syslinux_adv_ptr(); + + printf("ADV size: %zd bytes at %p\n", s, p); + + ep = p+s; /* Need at least opcode+len */ + while (p < ep-1 && *p) { + int t = *p++; + int l = *p++; + + if (p+l > ep) + break; + + memcpy(buf, p, l); + buf[l] = '\0'; + + printf("ADV %3d: \"%s\"\n", t, buf); + + p += l; + } + + return 0; +} diff --git a/comboot.doc b/comboot.doc index c5207042..50da6fa0 100644 --- a/comboot.doc +++ b/comboot.doc @@ -828,7 +828,7 @@ AX=001Ah [3.50] Cleanup, shuffle and boot to flat protected mode AX=001Bh [3.50] Cleanup, shuffle and boot to real mode - Input: AX 001Ah + Input: AX 001Bh DX derivative-specific flags (see function 000Ch) ES:DI shuffle descriptor list (must be in low memory) CX number of shuffle descriptors @@ -869,3 +869,25 @@ AX=001Bh [3.50] Cleanup, shuffle and boot to real mode }; Interrupts are off and DF=0 on entry. + + +AX=001Ch [3.53] Get pointer to auxilliary data vector + Input: AX 001Ch + Output: ES:BX Auxilliary data vector + CX Size of the ADV (currently 500 bytes) + + The auxillary data vector is a tagged data structure used + to carry a small amount of information (up to 500 bytes) from + one boot to another. + + +AX=001Dh [3.53] Write auxilliary data vector + Input: AX 001Dh + Output: None + + Write the auxilliary data vector back to disk. Returns + failure for non-disk-based derivatives unless the "auxdata" + configuration command is used to specify a disk location. + + In a future version, PXELINUX may end up attempting to save + the ADV on the server via TFTP write. diff --git a/comboot.inc b/comboot.inc index 2c1c8826..7deac33c 100644 --- a/comboot.inc +++ b/comboot.inc @@ -592,6 +592,7 @@ comapi_dnsresolv: mov si,P_BX call dns_resolv mov P_EAX,eax + clc ret %else comapi_dnsresolv equ comapi_err @@ -898,6 +899,20 @@ comapi_shufflerm: stc ret +; +; INT 22h AX=001Ch Get pointer to auxillary data vector +; +comapi_getadv: + mov P_ES,ds + mov P_BX,adv0.data + mov P_CX,ADV_LEN + ret + +; +; INT 22h AX=001Dh Write auxillary data vector +; +comapi_writeadv equ adv_write + section .data %macro int21 2 @@ -948,6 +963,8 @@ int22_table: dw comapi_readdisk ; 0019 read disk dw comapi_shufflepm ; 001A cleanup, shuffle and boot to pm dw comapi_shufflerm ; 001B cleanup, shuffle and boot to rm + dw comapi_getadv ; 001C get pointer to ADV + dw comapi_writeadv ; 001D write ADV to disk int22_count equ ($-int22_table)/2 APIKeyWait db 0 diff --git a/extlinux.asm b/extlinux.asm index 6666f794..5e662d9b 100644 --- a/extlinux.asm +++ b/extlinux.asm @@ -112,7 +112,7 @@ trackbuf resb trackbufsize ; Track buffer goes here getcbuf resb trackbufsize ; ends at 4800h - section .bss + section .bss1 SuperBlock resb 1024 ; ext2 superblock SuperInfo resq 16 ; DOS superblock expanded ClustSize resd 1 ; Bytes/cluster ("block") @@ -1528,7 +1528,8 @@ getfssec: %include "highmem.inc" ; High memory sizing %include "strcpy.inc" ; strcpy() %include "strecpy.inc" ; strcpy with end pointer check -%include "cache.inc" +%include "cache.inc" ; Metadata disk cache +%include "adv.inc" ; Auxillary Data Vector ; ----------------------------------------------------------------------------- ; Begin data section diff --git a/isolinux.asm b/isolinux.asm index ba7a6a66..0be751f1 100644 --- a/isolinux.asm +++ b/isolinux.asm @@ -1493,6 +1493,7 @@ getfssec: %include "highmem.inc" ; High memory sizing %include "strcpy.inc" ; strcpy() %include "rawcon.inc" ; Console I/O w/o using the console functions +%include "adv.inc" ; Auxillary Data Vector ; ----------------------------------------------------------------------------- ; Begin data section @@ -56,7 +56,7 @@ STACK_START equ TEXT_START-STACK_SIZE ; NASM BUG: .data always follows .text; can't override section .data align=16 ; follows=.text - section .adv progbits align=1 follows=.config + section .adv progbits align=512 follows=.config ; .uibss contains bss data which is guaranteed to be ; safe to clobber during the loading of the image. This diff --git a/ldlinux.asm b/ldlinux.asm index ff900435..538ce681 100644 --- a/ldlinux.asm +++ b/ldlinux.asm @@ -827,13 +827,13 @@ genfatinfo: bsr cx,ax mov [ClustShift],cl push cx - add cl,9 + add cl,SECTOR_SHIFT mov [ClustByteShift],cl pop cx dec ax mov [ClustMask],eax inc ax - shl eax,9 + shl eax,SECTOR_SHIFT mov [ClustSize],eax ; @@ -869,14 +869,6 @@ getfattype: %include "init.inc" ; -; Clear Files structures -; - mov di,Files - mov cx,(MAX_OPEN*open_file_t_size)/4 - xor eax,eax - rep stosd - -; ; Initialize the metadata cache ; call initcache @@ -1550,6 +1542,7 @@ getfatsector: %include "highmem.inc" ; High memory sizing %include "strcpy.inc" ; strcpy() %include "cache.inc" ; Metadata disk cache +%include "adv.inc" ; Auxillary Data Vector ; ----------------------------------------------------------------------------- ; Begin data section diff --git a/pxelinux.asm b/pxelinux.asm index 431ee90f..fa7eb434 100644 --- a/pxelinux.asm +++ b/pxelinux.asm @@ -2433,6 +2433,7 @@ writestr equ cwritestr %include "strcpy.inc" ; strcpy() %include "rawcon.inc" ; Console I/O w/o using the console functions %include "dnsresolv.inc" ; DNS resolver +%include "adv.inc" ; Auxillary Data Vector ; ----------------------------------------------------------------------------- ; Begin data section @@ -17,6 +17,8 @@ load_config_file: call parse_config ; Parse configuration file no_config_file: + call adv_init + ; ; Check whether or not we are supposed to display the boot prompt. ; |