make user define debug variable. get rid of the COMMON_ETHER
define; always require a machdep_common_ether routine, which may do zip if no common enet addr
This commit is contained in:
parent
e4da5d66a6
commit
aed90a8659
@ -1,9 +1,8 @@
|
||||
# $Id: Makefile,v 1.4 1993/10/13 16:33:55 cgd Exp $
|
||||
# $Id: Makefile,v 1.5 1993/10/13 21:22:27 cgd Exp $
|
||||
|
||||
LIB= netboot
|
||||
SRCS= arp.c bootinfo.c bootp.c exec.c globals.c in_cksum.c \
|
||||
net.c netif.c nfsboot.c rpc.c util.c
|
||||
CFLAGS+= -DCOMMON_ETHERADDR
|
||||
|
||||
NOPROFILE=
|
||||
NOPIC=
|
||||
|
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Header: /cvsroot/src/sys/lib/libnetboot/Attic/boot_nfs.c,v 1.2 1993/10/13 16:33:58 cgd Exp $
|
||||
* $Header: /cvsroot/src/sys/lib/libnetboot/Attic/boot_nfs.c,v 1.3 1993/10/13 21:22:29 cgd Exp $
|
||||
*/
|
||||
/*
|
||||
* Copyright (c) 1992 Regents of the University of California.
|
||||
@ -69,7 +69,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#) $Header: /cvsroot/src/sys/lib/libnetboot/Attic/boot_nfs.c,v 1.2 1993/10/13 16:33:58 cgd Exp $ (LBL)
|
||||
* @(#) $Header: /cvsroot/src/sys/lib/libnetboot/Attic/boot_nfs.c,v 1.3 1993/10/13 21:22:29 cgd Exp $ (LBL)
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -160,9 +160,7 @@ unsigned int nfs_boot(kernel_override, machdep_hint)
|
||||
netif_init();
|
||||
while (1) {
|
||||
bzero(desc, sizeof(*desc));
|
||||
#ifdef COMMON_ETHERADDR
|
||||
machdep_common_ether(desc->myea);
|
||||
#endif
|
||||
nif = netif_select(machdep_hint);
|
||||
if (!nif)
|
||||
panic("netboot: no interfaces left untried");
|
||||
|
@ -4,7 +4,7 @@
|
||||
* global variables should be separate, so nothing else
|
||||
* must be included extraneously.
|
||||
*
|
||||
* $Id: globals.c,v 1.1 1993/10/13 16:33:56 cgd Exp $
|
||||
* $Id: globals.c,v 1.2 1993/10/13 21:22:28 cgd Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -24,9 +24,3 @@ n_long smask; /* subnet mask */
|
||||
n_long nmask; /* net mask */
|
||||
n_long mask; /* subnet or net mask */
|
||||
time_t bot; /* beginning of time in seconds */
|
||||
|
||||
#ifdef DEBUG
|
||||
int debug = 1;
|
||||
#else
|
||||
int debug = 0;
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user