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

[Aurelien Jarno]

Author: aurel32
Date: 2010-01-15 14:58:04 +0000 (Fri, 15 Jan 2010)
New Revision: 2927

Modified:
   trunk/kfreebsd-7/debian/arch/amd64/amd64.config
   trunk/kfreebsd-7/debian/arch/i386/486.config
   trunk/kfreebsd-7/debian/arch/i386/686-smp.config
   trunk/kfreebsd-7/debian/arch/i386/686.config
   trunk/kfreebsd-7/debian/changelog
Log:
  * Revert BOOPT kernel options changes.  Closes: #565396. 
    Reopens: #550429.



Modified: trunk/kfreebsd-7/debian/arch/amd64/amd64.config
===================================================================
--- trunk/kfreebsd-7/debian/arch/amd64/amd64.config	2010-01-15 14:19:46 UTC (rev 2926)
+++ trunk/kfreebsd-7/debian/arch/amd64/amd64.config	2010-01-15 14:58:04 UTC (rev 2927)
@@ -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-7/debian/arch/i386/486.config
===================================================================
--- trunk/kfreebsd-7/debian/arch/i386/486.config	2010-01-15 14:19:46 UTC (rev 2926)
+++ trunk/kfreebsd-7/debian/arch/i386/486.config	2010-01-15 14:58:04 UTC (rev 2927)
@@ -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-7/debian/arch/i386/686-smp.config
===================================================================
--- trunk/kfreebsd-7/debian/arch/i386/686-smp.config	2010-01-15 14:19:46 UTC (rev 2926)
+++ trunk/kfreebsd-7/debian/arch/i386/686-smp.config	2010-01-15 14:58:04 UTC (rev 2927)
@@ -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-7/debian/arch/i386/686.config
===================================================================
--- trunk/kfreebsd-7/debian/arch/i386/686.config	2010-01-15 14:19:46 UTC (rev 2926)
+++ trunk/kfreebsd-7/debian/arch/i386/686.config	2010-01-15 14:58:04 UTC (rev 2927)
@@ -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-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2010-01-15 14:19:46 UTC (rev 2926)
+++ trunk/kfreebsd-7/debian/changelog	2010-01-15 14:58:04 UTC (rev 2927)
@@ -1,3 +1,10 @@
+kfreebsd-7 (7.2-11) unstable; urgency=low
+
+  * Revert BOOPT kernel options changes.  Closes: #565396. 
+    Reopens: #550429.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Fri, 15 Jan 2010 15:25:31 +0100
+
 kfreebsd-7 (7.2-10) unstable; urgency=low
 
   * Add BOOTP kernel options for NFS Root support. Closes: #550429.