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

[Aurelien Jarno]

Author: aurel32
Date: 2009-08-10 07:47:41 +0000 (Mon, 10 Aug 2009)
New Revision: 2702

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/kldutils.init
Log:
  * kldutils: fix init script in case /etc/modules.d/ is empty.



Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2009-08-10 07:29:59 UTC (rev 2701)
+++ trunk/freebsd-utils/debian/changelog	2009-08-10 07:47:41 UTC (rev 2702)
@@ -6,6 +6,7 @@
     bug#539599).
   * 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.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sun, 02 Aug 2009 12:17:35 +0200
 

Modified: trunk/freebsd-utils/debian/kldutils.init
===================================================================
--- trunk/freebsd-utils/debian/kldutils.init	2009-08-10 07:29:59 UTC (rev 2701)
+++ trunk/freebsd-utils/debian/kldutils.init	2009-08-10 07:47:41 UTC (rev 2702)
@@ -21,23 +21,28 @@
 # Version:	@(#)skeleton  1.9  26-Feb-2001  miquels at cistron.nl
 #
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+set -e
 
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
 do_start() {
 	for i in load stat unload ; do
-		which kld$i >/dev/null || exit 1
+		which kld${i} >/dev/null || exit 1
 	done
-	modules="`sed -e 's/#.*//g' -e '/^\( \|\t\)*$/d' /etc/modules /etc/modules.d/*`"
-	set -e
-
-	for i in ${modules} ; do
-		if ! kldstat -n $i >/dev/null 2>/dev/null ; then
-			echo "Loading $i ..."
-			kldload $i || true
-			echo "... done."
-		else
-			echo "Not loading $i (already loaded)"
+	for file in /etc/modules /etc/modules.d/* ; do
+		if ! test -f ${file} ; then
+			continue
 		fi
+		modules="`sed -e 's/#.*//g' -e '/^\( \|\t\)*$/d' ${file}`"
+		for module in ${modules} ; do
+			if ! kldstat -n ${module} >/dev/null 2>/dev/null ; then
+				echo "Loading ${module} ..."
+				kldload ${module} || true
+				echo "... done."
+			else
+				echo "Not loading ${module} (already loaded)"
+			fi
+		done
 	done
 }