From owner-svn-src-head@FreeBSD.ORG  Fri Jul 22 21:08:20 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 28598106566B;
	Fri, 22 Jul 2011 21:08:20 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 18B098FC14;
	Fri, 22 Jul 2011 21:08:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6ML8JhC032427;
	Fri, 22 Jul 2011 21:08:19 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6ML8JUL032425;
	Fri, 22 Jul 2011 21:08:19 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201107222108.p6ML8JUL032425@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 22 Jul 2011 21:08:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224273 - head/etc/rc.d
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Jul 2011 21:08:20 -0000

Author: dougb
Date: Fri Jul 22 21:08:19 2011
New Revision: 224273
URL: http://svn.freebsd.org/changeset/base/224273

Log:
  Revert the apparently-unecessary module_path twiddling from r223917
  
  Approved by:	re (kib)

Modified:
  head/etc/rc.d/kld

Modified: head/etc/rc.d/kld
==============================================================================
--- head/etc/rc.d/kld	Fri Jul 22 18:03:33 2011	(r224272)
+++ head/etc/rc.d/kld	Fri Jul 22 21:08:19 2011	(r224273)
@@ -41,24 +41,11 @@ kld_start()
 {
 	[ -n "$kld_list" ] || return
 
-	local _kernel_path _module_path _kld _path
-
-	_kernel_path=`$SYSCTL_N kern.bootfile`
-	_kernel_path="${_kernel_path%/*}"
-
-	_module_path=`$SYSCTL_N kern.module_path`
-	_module_path="${_module_path#*\;}"
-	_module_path="$_kernel_path `ltr $_module_path \; ' '`"
+	local _kld
 
 	echo 'Loading kernel modules:'
 	for _kld in $kld_list ; do
-		for _path in $_module_path ; do
-			if [ -x "${_path}/${_kld}.ko" ]; then
-				load_kld -e ${_kld}.ko ${_path}/${_kld}.ko
-				continue 2
-			fi
-		done
-		warn "${_kld}.ko not found in $_module_path"
+		load_kld -e ${_kld}.ko $_kld
 	done
 }