From owner-cvs-sys  Tue May 13 19:49:07 1997
Return-Path: <owner-cvs-sys>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id TAA09385
          for cvs-sys-outgoing; Tue, 13 May 1997 19:49:07 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.cdrom.com [204.216.27.21])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id TAA09343;
          Tue, 13 May 1997 19:48:46 -0700 (PDT)
From: Tor Egge <tegge@FreeBSD.ORG>
Received: (from tegge@localhost)
	by freefall.freebsd.org (8.8.5/8.8.5) id TAA04858;
	Tue, 13 May 1997 19:47:48 -0700 (PDT)
Date: Tue, 13 May 1997 19:47:48 -0700 (PDT)
Message-Id: <199705140247.TAA04858@freefall.freebsd.org>
To: CVS-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-sys@FreeBSD.ORG
Subject: cvs commit:  src/sys/i386/boot/netboot Makefile bootmenu.c main.c netboot.h ns8390.c rpc.c start2.S
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

tegge       97/05/13 19:47:48

  Branch:      sys/i386/boot/netboot  RELENG_2_2
  Modified:    sys/i386/boot/netboot  Makefile bootmenu.c main.c netboot.h
                        ns8390.c rpc.c start2.S
  Log:
  Merge from current: improved bootp support for netboot.
  Submitted by:	Luigi Rizzo <luigi@labinfo.iet.unipi.it>
  
  Revision  Changes    Path
  1.9.2.2   +0 -1      src/sys/i386/boot/netboot/Makefile
  1.13.2.1  +44 -66    src/sys/i386/boot/netboot/bootmenu.c
  1.18.2.2  +50 -10    src/sys/i386/boot/netboot/main.c
  1.9.2.2   +12 -2     src/sys/i386/boot/netboot/netboot.h
  1.7.2.3   +13 -1     src/sys/i386/boot/netboot/ns8390.c
  1.2.2.1   +4 -1      src/sys/i386/boot/netboot/rpc.c
  1.2.2.4   +0 -6      src/sys/i386/boot/netboot/start2.S