[Glibc-bsd-commits] r2820 - in trunk/kfreebsd-8/debian: . arch/amd64 arch/i386

[Petr Salinger]

Author: ps-guest
Date: 2009-11-09 13:03:25 +0000 (Mon, 09 Nov 2009)
New Revision: 2820

Modified:
   trunk/kfreebsd-8/debian/arch/amd64/amd64.config
   trunk/kfreebsd-8/debian/arch/i386/486.config
   trunk/kfreebsd-8/debian/arch/i386/686-smp.config
   trunk/kfreebsd-8/debian/arch/i386/686.config
   trunk/kfreebsd-8/debian/changelog
Log:
merge from kfreebsd-7



Modified: trunk/kfreebsd-8/debian/arch/amd64/amd64.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/amd64/amd64.config	2009-11-08 13:50:45 UTC (rev 2819)
+++ trunk/kfreebsd-8/debian/arch/amd64/amd64.config	2009-11-09 13:03:25 UTC (rev 2820)
@@ -12,4 +12,11 @@
 options		FDESCFS
 options		TMPFS
 
+# Use BOOTP to obtain IP address/hostname
+options     BOOTP
+options     BOOTP_COMPAT
+# NFS mount root file system using BOOTP info
+options     BOOTP_NFSROOT
+options     BOOTP_NFSV3
+
 #include         GENERIC

Modified: trunk/kfreebsd-8/debian/arch/i386/486.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/i386/486.config	2009-11-08 13:50:45 UTC (rev 2819)
+++ trunk/kfreebsd-8/debian/arch/i386/486.config	2009-11-09 13:03:25 UTC (rev 2820)
@@ -17,5 +17,11 @@
 device		xboxfb
 device		fb
 
+# Use BOOTP to obtain IP address/hostname
+options     BOOTP
+options     BOOTP_COMPAT
+# NFS mount root file system using BOOTP info
+options     BOOTP_NFSROOT
+options     BOOTP_NFSV3
 
 #include		GENERIC

Modified: trunk/kfreebsd-8/debian/arch/i386/686-smp.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/i386/686-smp.config	2009-11-08 13:50:45 UTC (rev 2819)
+++ trunk/kfreebsd-8/debian/arch/i386/686-smp.config	2009-11-09 13:03:25 UTC (rev 2820)
@@ -13,4 +13,11 @@
 options		FDESCFS
 options		TMPFS
 
+# Use BOOTP to obtain IP address/hostname
+options     BOOTP
+options     BOOTP_COMPAT
+# NFS mount root file system using BOOTP info
+options     BOOTP_NFSROOT
+options     BOOTP_NFSV3
+
 #include		GENERIC

Modified: trunk/kfreebsd-8/debian/arch/i386/686.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/i386/686.config	2009-11-08 13:50:45 UTC (rev 2819)
+++ trunk/kfreebsd-8/debian/arch/i386/686.config	2009-11-09 13:03:25 UTC (rev 2820)
@@ -15,5 +15,11 @@
 device		xboxfb
 device		fb
 
+# Use BOOTP to obtain IP address/hostname
+options     BOOTP
+options     BOOTP_COMPAT
+# NFS mount root file system using BOOTP info
+options     BOOTP_NFSROOT
+options     BOOTP_NFSV3
 
 #include		GENERIC

Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2009-11-08 13:50:45 UTC (rev 2819)
+++ trunk/kfreebsd-8/debian/changelog	2009-11-09 13:03:25 UTC (rev 2820)
@@ -1,4 +1,4 @@
-kfreebsd-8 (8.0~cvs20091026-1) experimental; urgency=low
+kfreebsd-8 (8.0~cvs20091109-1) EXPERIMENTAL; urgency=low
 
   [ Petr Salinger ]
   * New upstream snapshot of RELENG_8_0
@@ -18,8 +18,24 @@
   * Partially drop and refresh the rest
      - 001_misc.diff
 
- -- Aurelien Jarno <aurel32 at debian.org>  Wed, 04 Nov 2009 12:06:42 +0100
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 09 Nov 2009 12:06:42 +0100
 
+kfreebsd-7 (7.2-10) UNRELEASED; urgency=low
+
+  * Add BOOTP kernel options for NFS Root support. Closes: #550429.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 12 Oct 2009 10:58:56 +0200
+
+kfreebsd-7 (7.2-9) unstable; urgency=high
+
+  [ Petr Salinger ]
+  * Fix Devfs / VFS NULL pointer race condition
+    (FreeBSD-SA-09:14.devfs). Closes: #549871.
+  * Add no zero mapping feature
+    (FreeBSD-EN-09:05.null).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 06 Oct 2009 16:26:08 +0200
+
 kfreebsd-7 (7.2-8) unstable; urgency=low
 
   [ Petr Salinger ]