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

[Petr Salinger]

Author: ps-guest
Date: 2009-11-13 08:18:11 +0000 (Fri, 13 Nov 2009)
New Revision: 2823

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:
backout part of kfreebsd-7 changes - the NFS/BOOTP



Modified: trunk/kfreebsd-8/debian/arch/amd64/amd64.config
===================================================================
--- trunk/kfreebsd-8/debian/arch/amd64/amd64.config	2009-11-13 07:17:42 UTC (rev 2822)
+++ trunk/kfreebsd-8/debian/arch/amd64/amd64.config	2009-11-13 08:18:11 UTC (rev 2823)
@@ -12,11 +12,4 @@
 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-13 07:17:42 UTC (rev 2822)
+++ trunk/kfreebsd-8/debian/arch/i386/486.config	2009-11-13 08:18:11 UTC (rev 2823)
@@ -17,11 +17,5 @@
 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-13 07:17:42 UTC (rev 2822)
+++ trunk/kfreebsd-8/debian/arch/i386/686-smp.config	2009-11-13 08:18:11 UTC (rev 2823)
@@ -13,11 +13,4 @@
 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-13 07:17:42 UTC (rev 2822)
+++ trunk/kfreebsd-8/debian/arch/i386/686.config	2009-11-13 08:18:11 UTC (rev 2823)
@@ -15,11 +15,5 @@
 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-13 07:17:42 UTC (rev 2822)
+++ trunk/kfreebsd-8/debian/changelog	2009-11-13 08:18:11 UTC (rev 2823)
@@ -1,4 +1,4 @@
-kfreebsd-8 (8.0~cvs20091109-1) EXPERIMENTAL; urgency=low
+kfreebsd-8 (8.0~cvs20091113-1) EXPERIMENTAL; urgency=low
 
   [ Petr Salinger ]
   * New upstream snapshot of RELENG_8_0
@@ -18,14 +18,8 @@
   * Partially drop and refresh the rest
      - 001_misc.diff
 
- -- Aurelien Jarno <aurel32 at debian.org>  Mon, 09 Nov 2009 12:06:42 +0100
+ -- Aurelien Jarno <aurel32 at debian.org>  Fri, 13 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 ]