Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88f66ea9 authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

kconfig: Look in both /bin and /sbin for lsmod in streamline_config.pl 



Distributions now have lsmod in /bin instead of /sbin. But to handle
both cases, we look for it in /sbin /bin /usr/bin and /usr/sbin.
If lsmod is not found in any of those paths, it defaults to use
just lsmod and hopes that it lies in the path of the user.

Tested-by: default avatarXavier Chantry <shiningxc@gmail.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 13d7e938

scripts/kconfig/streamline_config.pl

+14 −1
Original line number Diff line number Diff line
@@ -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+)/) {