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

[Aurelien Jarno]

Author: aurel32
Date: 2009-08-10 08:00:10 +0000 (Mon, 10 Aug 2009)
New Revision: 2703

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/freebsd-utils.init
   trunk/freebsd-utils/debian/kldutils.init
Log:
  * Move "sysctl kern.module_path" from freebsd-utils.init to
    kldutils.init.



Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2009-08-10 07:47:41 UTC (rev 2702)
+++ trunk/freebsd-utils/debian/changelog	2009-08-10 08:00:10 UTC (rev 2703)
@@ -7,6 +7,8 @@
   * kbdcontrol: change the priority of debconf question to critical to
     make sure it appears in debian-installer. Default to us.unix.kbd.
   * kldutils: fix init script in case /etc/modules.d/ is empty.
+  * Move "sysctl kern.module_path" from freebsd-utils.init to
+    kldutils.init.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sun, 02 Aug 2009 12:17:35 +0200
 

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2009-08-10 07:47:41 UTC (rev 2702)
+++ trunk/freebsd-utils/debian/control	2009-08-10 08:00:10 UTC (rev 2703)
@@ -44,7 +44,7 @@
 Package: kldutils
 Priority: important
 Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: freebsd-utils, ${shlibs:Depends}, ${misc:Depends}
 Replaces: module-init-tools, freebsd-utils (<= 5.2.1-16),
  freebsd-hackedutils (<= 6.1-1), kfreebsd-common (<< 6.1-6)
 Provides: module-init-tools

Modified: trunk/freebsd-utils/debian/freebsd-utils.init
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.init	2009-08-10 07:47:41 UTC (rev 2702)
+++ trunk/freebsd-utils/debian/freebsd-utils.init	2009-08-10 08:00:10 UTC (rev 2703)
@@ -84,9 +84,6 @@
     
     echo "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"
-    
     if test -f /etc/mtab && ! test -h /etc/mtab ; then
       echo "Warning: /etc/mtab is a regular file, replacing with symlink."
       rm -f /etc/mtab

Modified: trunk/freebsd-utils/debian/kldutils.init
===================================================================
--- trunk/freebsd-utils/debian/kldutils.init	2009-08-10 07:47:41 UTC (rev 2702)
+++ trunk/freebsd-utils/debian/kldutils.init	2009-08-10 08:00:10 UTC (rev 2703)
@@ -26,9 +26,14 @@
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
 do_start() {
-	for i in load stat unload ; do
-		which kld${i} >/dev/null || exit 1
+	for i in sysctl kldload kldstat kldunload ; do
+		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"
+
+	# Load modules
 	for file in /etc/modules /etc/modules.d/* ; do
 		if ! test -f ${file} ; then
 			continue