diff options
Diffstat (limited to 'sys/arch/amd64/stand/pxeboot')
| -rw-r--r-- | sys/arch/amd64/stand/pxeboot/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/pxeboot/pxeboot.8 | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sys/arch/amd64/stand/pxeboot/conf.c b/sys/arch/amd64/stand/pxeboot/conf.c index 4a10e47908a..0c17e412690 100644 --- a/sys/arch/amd64/stand/pxeboot/conf.c +++ b/sys/arch/amd64/stand/pxeboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.12 2007/01/02 16:34:16 tom Exp $ */ +/* $OpenBSD: conf.c,v 1.13 2007/04/28 19:23:10 deraadt Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -45,7 +45,7 @@ #include "pxeboot.h" #include "pxe_net.h" -const char version[] = "1.11"; +const char version[] = "1.12"; int debug = 0; #undef _TEST diff --git a/sys/arch/amd64/stand/pxeboot/pxeboot.8 b/sys/arch/amd64/stand/pxeboot/pxeboot.8 index 14ff6811de5..abab283bca5 100644 --- a/sys/arch/amd64/stand/pxeboot/pxeboot.8 +++ b/sys/arch/amd64/stand/pxeboot/pxeboot.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pxeboot.8,v 1.7 2007/02/12 22:13:07 jmc Exp $ +.\" $OpenBSD: pxeboot.8,v 1.8 2007/04/28 19:23:10 deraadt Exp $ .\" Copyright (c) 2004 Tom Cosgrove .\" Copyright (c) 2003 Matthias Drochner .\" Copyright (c) 1999 Doug White @@ -55,6 +55,10 @@ boot program will look for an configuration file on the TFTP server. If it finds one, it processes the commands within it. +.Pa boot.conf +processing can be skipped by holding down either Control key as +.Nm +starts. .Pp .Nm then sits in a loop, |