[Midnightbsd-cvs] src [10191] sync

[laffer1 at midnightbsd.org]

Revision: 10191
          http://svnweb.midnightbsd.org/src/?rev=10191
Author:   laffer1
Date:     2018-06-01 19:35:59 -0400 (Fri, 01 Jun 2018)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/sys/boot/i386/pmbr/Makefile
    trunk/sys/boot/i386/pxeldr/Makefile
    trunk/sys/boot/i386/pxeldr/pxeboot.8

Property Changed:
----------------
    trunk/sys/boot/i386/pxeldr/pxeboot.8

Modified: trunk/sys/boot/i386/pmbr/Makefile
===================================================================
--- trunk/sys/boot/i386/pmbr/Makefile	2018-06-01 23:33:08 UTC (rev 10190)
+++ trunk/sys/boot/i386/pmbr/Makefile	2018-06-01 23:35:59 UTC (rev 10191)
@@ -1,10 +1,10 @@
-# $MidnightBSD: src/sys/boot/i386/pmbr/Makefile,v 1.1 2011/10/16 21:11:09 laffer1 Exp $
-# $FreeBSD: src/sys/boot/i386/pmbr/Makefile,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/boot/i386/pmbr/Makefile 276486 2014-12-31 23:25:37Z ngie $
 
 PROG=	pmbr
 STRIP=
 BINMODE=${NOBINMODE}
-NO_MAN=
+MAN=
 SRCS=	${PROG}.s
 
 ORG=	0x600

Modified: trunk/sys/boot/i386/pxeldr/Makefile
===================================================================
--- trunk/sys/boot/i386/pxeldr/Makefile	2018-06-01 23:33:08 UTC (rev 10190)
+++ trunk/sys/boot/i386/pxeldr/Makefile	2018-06-01 23:35:59 UTC (rev 10191)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sys/boot/i386/pxeldr/Makefile 319025 2017-05-28 01:14:59Z ngie $
 
 # Pick up ../Makefile.inc early.
 .include <bsd.init.mk>
@@ -31,7 +32,7 @@
 
 ${BOOT}: ${LDR} ${LOADER}
 	cat ${LDR} ${LOADER} > ${.TARGET}.tmp
-	dd if=${.TARGET}.tmp of=${.TARGET} obs=2k conv=osync
+	${DD} if=${.TARGET}.tmp of=${.TARGET} obs=2k conv=osync
 	rm ${.TARGET}.tmp
 
 LDFLAGS+=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat,binary

Modified: trunk/sys/boot/i386/pxeldr/pxeboot.8
===================================================================
--- trunk/sys/boot/i386/pxeldr/pxeboot.8	2018-06-01 23:33:08 UTC (rev 10190)
+++ trunk/sys/boot/i386/pxeldr/pxeboot.8	2018-06-01 23:35:59 UTC (rev 10191)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 1999 Doug White
 .\" All rights reserved.
 .\"
@@ -22,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/sys/boot/i386/pxeldr/pxeboot.8 307203 2016-10-13 08:09:40Z sephe $
 .\"
 .Dd May 1, 2000
 .Dt PXEBOOT 8
@@ -85,6 +86,14 @@
 .Pa /boot/loader.rc
 from the specified server before loading any other files.
 .Pp
+.Nm
+defaults to a conservative 1024 byte NFS data packet size.
+This may be changed by setting the
+.Va nfs.read_size
+variable in
+.Pa /boot/loader.conf .
+Valid values range from 1024 to 4096 bytes.
+.Pp
 In all other respects,
 .Nm
 acts just like


Property changes on: trunk/sys/boot/i386/pxeldr/pxeboot.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property