[Glibc-bsd-commits] r4255 - trunk/freebsd-utils/debian

[Robert Millan]

Author: rmh
Date: 2012-05-06 10:50:09 +0000 (Sun, 06 May 2012)
New Revision: 4255

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/kldutils.init
Log:
Reduce kern.module_path to only contain versioned directories.

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2012-05-05 22:43:12 UTC (rev 4254)
+++ trunk/freebsd-utils/debian/changelog	2012-05-06 10:50:09 UTC (rev 4255)
@@ -2,6 +2,7 @@
 
   [ Robert Millan ]
   * Start devd after kldutils to ensure kern.module_path has been set.
+  * Reduce kern.module_path to only contain versioned directories.
 
   [ Steven Chamberlain ]
   * Return exit status 0 from the geli initscript if not configured, but
@@ -9,7 +10,7 @@
   * Fix duplicates of Section: utils or Priority: important in debian/control
     (lintian tag binary-control-field-duplicates-source)
 
- -- GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>  Thu, 26 Apr 2012 02:11:08 +0100
+ -- Robert Millan <rmh at debian.org>  Sun, 06 May 2012 12:49:51 +0200
 
 freebsd-utils (9.0+ds1-3) unstable; urgency=low
 

Modified: trunk/freebsd-utils/debian/kldutils.init
===================================================================
--- trunk/freebsd-utils/debian/kldutils.init	2012-05-05 22:43:12 UTC (rev 4254)
+++ trunk/freebsd-utils/debian/kldutils.init	2012-05-06 10:50:09 UTC (rev 4255)
@@ -21,8 +21,9 @@
 		which ${i} >/dev/null || exit 1
 	done
 
-	# This syctl is (supposedly) correct in kernel, but kfreebsd-loader enjoys messing with it
-	sysctl "kern.module_path=/lib/modules/`uname -r`;/boot/kernel"
+	# Override /boot/kernel default (we do this in userland to support
+	# upstream kernels)
+	sysctl "kern.module_path=/lib/modules/$(uname -r)"
 
 	# Load modules
 	for file in /etc/modules /etc/modules.d/* ; do