From owner-cvs-src@FreeBSD.ORG  Fri Sep  8 15:36:05 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CFCF916A506;
	Fri,  8 Sep 2006 15:36:05 +0000 (UTC) (envelope-from ru@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2DF7143DBC;
	Fri,  8 Sep 2006 15:33:28 +0000 (GMT) (envelope-from ru@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k88FXQJ7087342;
	Fri, 8 Sep 2006 15:33:26 GMT (envelope-from ru@repoman.freebsd.org)
Received: (from ru@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k88FXQnQ087341;
	Fri, 8 Sep 2006 15:33:26 GMT (envelope-from ru)
Message-Id: <200609081533.k88FXQnQ087341@repoman.freebsd.org>
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Fri, 8 Sep 2006 15:33:26 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/share/man/man5 make.conf.5 src/sys/boot/i386/pxeldr
 pxeldr.S
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Sep 2006 15:36:06 -0000

ru          2006-09-08 15:33:26 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    share/man/man5       make.conf.5 
    sys/boot/i386/pxeldr pxeldr.S 
  Log:
  MFC:
  
  - Make the PROBE_KEYBOARD compile-time option of pxeboot(8) better
    resemble the -P option in boot2, i.e., if keyboard isn't present
    then boot with both RB_SERIAL and RB_MULTIPLE set.
  
  - Document BOOT_PXELDR_ALWAYS_SERIAL and BOOT_PXELDR_PROBE_KEYBOARD
    options of pxeboot(8).
  
  Revision   Changes    Path
  1.121.2.9  +21 -0     src/share/man/man5/make.conf.5
  1.13.8.2   +4 -6      src/sys/boot/i386/pxeldr/pxeldr.S