---

yaml --- r: 180871 b: refs/heads/master c: 88f66ea h: refs/heads/master i: 180869: 5abc8ad 180867: 91143de 180863: c604f44 v: v3
git-mirror · Feb 2, 2010 · 2e88073 · 2e88073
1 parent 70212ae
commit 2e88073
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13d7e9385644d376a0816ad663ba3dfc45359f2f
+refs/heads/master: 88f66ea98d7ae6a8b6a34e38b1b4fa51abc1c9ca
diff --git a/trunk/scripts/kconfig/streamline_config.pl b/trunk/scripts/kconfig/streamline_config.pl
@@ -264,7 +264,20 @@ sub read_kconfig {
 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+)/) {