From patchwork Wed Feb  3 15:46:08 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Steven Rostedt <rostedt@goodmis.org>
X-Patchwork-Id: 76733
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o13Fodp6022859
	for <patchwork-kbuild@patchwork.kernel.org>;
	Wed, 3 Feb 2010 15:50:39 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1757352Ab0BCPtL (ORCPT
	<rfc822;patchwork-kbuild@patchwork.kernel.org>);
	Wed, 3 Feb 2010 10:49:11 -0500
Received: from hrndva-omtalb.mail.rr.com ([71.74.56.124]:34286 "EHLO
	hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by
	vger.kernel.org with ESMTP id S1757337Ab0BCPtJ (ORCPT
	<rfc822;linux-kbuild@vger.kernel.org>);
	Wed, 3 Feb 2010 10:49:09 -0500
X-Authority-Analysis: v=1.0 c=1 a=IQbZ46gXzHUA:10 a=20KFwNOVAAAA:8
	a=pGLkceISAAAA:8 a=meVymXHHAAAA:8 a=x6C2UzhSFb6Sx6bTZhwA:9
	a=rzzK0JazwLDo2KmUSIUA:7 a=QZaVOT6wBCyAb0KN1K7FaKBWR_sA:4
	a=jEp0ucaQiEUA:10 a=MSl-tDqOz04A:10 a=jeBq3FmKZ4MA:10
X-Cloudmark-Score: 0
X-Originating-IP: 74.67.89.75
Received: from [74.67.89.75] ([74.67.89.75:34622] helo=gandalf.stny.rr.com)
	by hrndva-oedge02.mail.rr.com (envelope-from <rostedt@goodmis.org>)
	(ecelerity 2.2.2.39 r()) with ESMTP
	id 3A/8E-21749-2FA996B4; Wed, 03 Feb 2010 15:49:06 +0000
Received: from rostedt by gandalf.stny.rr.com with local (Exim 4.71)
	(envelope-from <rostedt@goodmis.org>)
	id 1NchTW-0006TW-Cp; Wed, 03 Feb 2010 10:49:06 -0500
Message-Id: <20100203154906.255551521@goodmis.org>
User-Agent: quilt/0.48-1
Date: Wed, 03 Feb 2010 10:46:08 -0500
From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: linux-kbuild@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>,
	Anibal Monsalve Salazar <anibal@debian.org>,
	Michal Marek <mmarek@suse.cz>, Xavier Chantry <shiningxc@gmail.com>
Subject: [PATCH 3/4] kconfig: Look in both /bin and /sbin for lsmod in
	streamline_config.pl
References: <20100203154605.461025238@goodmis.org>
Content-Disposition: inline;
	filename=0003-kconfig-Look-in-both-bin-and-sbin-for-lsmod-in-strea.patch
Sender: linux-kbuild-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kbuild.vger.kernel.org>
X-Mailing-List: linux-kbuild@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Wed, 03 Feb 2010 15:50:39 +0000 (UTC)


diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index 9e66fa8..d7f7db7 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -264,7 +264,20 @@ foreach my $makefile (@makefiles) {
 my %modules;
 
 # see what modules are loaded on this system
-open(LIN,"/sbin/lsmod|") || die "Cant lsmod";
+my $lsmod;
+
+foreach $dir ( ("/sbin", "/bin", "/usr/sbin", "/usr/bin") ) {
+    if ( -x "$dir/lsmod" ) {
+	$lsmod = "$dir/lsmod";
+	last;
+    }
+}
+if (!defined($lsmod)) {
+    # try just the path
+    $lsmod = "lsmod";
+}
+
+open(LIN,"$lsmod|") || die "Can not call lsmod with $lsmod";
 while (<LIN>) {
 	next if (/^Module/);  # Skip the first line.
 	if (/^(\S+)/) {