diff options
| author | Tom Cosgrove <tom@cvs.openbsd.org> | 2004-08-24 15:33:26 +0000 |
|---|---|---|
| committer | Tom Cosgrove <tom@cvs.openbsd.org> | 2004-08-24 15:33:26 +0000 |
| commit | dd6e8ad88c5325d13d558de8669f7c53321295e5 (patch) | |
| tree | f66461fffbdb7dc8e4c0978146c3768ff8e239f0 /sys/arch/amd64 | |
| parent | 46d08bd139575d44e0d326b8b67a2805675defc6 (diff) | |
Have cdbr look for cdboot at /3.6/amd64/cdboot as well as at /cdboot.
"go for it" deraadt@
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/stand/cdbr/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/cdbr/cdbr.S | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sys/arch/amd64/stand/cdbr/Makefile b/sys/arch/amd64/stand/cdbr/Makefile index e79ea20c858..681c1cb00c0 100644 --- a/sys/arch/amd64/stand/cdbr/Makefile +++ b/sys/arch/amd64/stand/cdbr/Makefile @@ -1,9 +1,11 @@ -# $OpenBSD: Makefile,v 1.1 2004/08/21 18:48:37 tom Exp $ +# $OpenBSD: Makefile,v 1.2 2004/08/24 15:33:25 tom Exp $ # PROG= cdbr SRCS= cdbr.S AFLAGS+=-m32 -I${.CURDIR} -I${.CURDIR}/../../.. #-Wa,-a +AFLAGS+=-DOSREV=\"${OSREV}\" +AFLAGS+=-DMACH=\"${MACHINE}\" -DMACH_U=\"${MACHINE:U}\" LD=ld ORG= 0x0000 LDFLAGS=-melf_i386 -nostdlib -Ttext ${ORG} -x -N -s -Bstatic -e start diff --git a/sys/arch/amd64/stand/cdbr/cdbr.S b/sys/arch/amd64/stand/cdbr/cdbr.S index 4d619c62afb..de2c4a03ac8 100644 --- a/sys/arch/amd64/stand/cdbr/cdbr.S +++ b/sys/arch/amd64/stand/cdbr/cdbr.S @@ -1,4 +1,4 @@ -/* $OpenBSD: cdbr.S,v 1.1 2004/08/21 18:48:37 tom Exp $ */ +/* $OpenBSD: cdbr.S,v 1.2 2004/08/24 15:33:25 tom Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove <tom.cosgrove@arches-consulting.com> @@ -510,7 +510,7 @@ edd_len: .byte 0x0 /* Num to read */ edd_addr: .word 0x0, 0x0 /* Seg:Off */ edd_lba: .quad 0x0 /* LBA */ -/* The data from here must be last in the file, only followed by zero bytes */ +/* The data from here must be last in the file, only followed by 0x00 bytes */ loader: .word 0 /* The path we end up using */ @@ -519,7 +519,11 @@ msg_failed: .ascii "Can't find " /* This string runs into... */ /* loader_paths is a list of ASCIZ strings followed by a term NUL byte */ loader_paths: .asciz "/cdboot" .asciz "/CDBOOT" - .byte 0 + .ascii "/", OSREV, "/", MACH, "/cdboot" + .byte 0 /* NUL-term line above */ + .ascii "/", OSREV, "/", MACH_U, "/CDBOOT" + .byte 0 /* NUL-term line above */ + .byte 0 /* Terminate the list */ . = BOOTSECTSIZE |