Look for module utilities in /sbin directories

From: Trent Piepho <xyzzy@speakeasy.org>

Normally programs like modinfo are in /sbin, and non-root users often
don't have this in their path.  Make the rmmod.pl script look in some
extra directories like /sbin, /usr/sbin, etc. if it can't find the
utilities in the path.

Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>

1 files changed, 21 insertions, 9 deletions

diff --git a/v4l/scripts/rmmod.pl b/v4l/scripts/rmmod.pl
index ade231707..d190a9edf 100755
--- a/v4l/scripts/rmmod.pl
+++ b/v4l/scripts/rmmod.pl
@@ -28,8 +28,17 @@ my %debug = (	"tuner"			=> "tuner_debug=1",
 	    );
 
 
+sub findprog($)
+{
+	foreach(split(/:/, $ENV{PATH}),qw(/sbin /usr/sbin /usr/local/sbin)) {
+		return "$_/$_[0]" if(-x "$_/$_[0]");
+	}
+	die "Can't find needed utility '$_[0]'";
+}
+
 sub parse_dir {
 	my $file = $File::Find::name;
+	my $modinfo = findprog('modinfo');
 
 	if (!($file =~ /[.]ko$/)) {
 		return;
@@ -38,7 +47,7 @@ sub parse_dir {
 	my $module = $file;
 	$module =~ s|^[./]*(.*)[.]ko|\1|;
 
-	open IN,  "modinfo $file|grep depends|cut -b 17-|";
+	open IN, "$modinfo $file|grep depends|cut -b 17-|";
 	while (<IN>) {
 		my $deps = $_;
 		$deps =~ s/\n//;
@@ -123,33 +132,36 @@ sub orderdep ()
 sub insmod ($)
 {
 	my $debug=shift;
+	my $modprobe = findprog('modprobe');
+	my $insmod = findprog('insmod');
 
 	while ( my ($key, $value) = each(%reqmodules) ) {
-		printf ("modprobe $key\n");
-		system ("modprobe $key");
+		print ("$modprobe $key\n");
+		system ("$modprobe $key");
 	}
 
 	foreach my $key (@modlist) {
 		if ($debug) {
 			my $dbg=$debug{$key};
 
-			printf "insmod ./$key.ko $dbg\n";
-			system "insmod ./$key.ko $dbg\n";
+			print "$insmod ./$key.ko $dbg\n";
+			system "$insmod ./$key.ko $dbg\n";
 		} else {
-			printf "insmod ./$key.ko\n";
-			system "insmod ./$key.ko\n";
+			print "$insmod ./$key.ko\n";
+			system "$insmod ./$key.ko\n";
 		}
 	}
 }
 
 sub rmmod ()
 {
+	my $rmmod = findprog('rmmod');
 	while (my $key=pop @modlist) {
 		my $dep=$key;
 		$dep=~s/[\-]/_/g;
 		if (exists ($loaded{$dep})) {
-			printf "rmmod $dep\n";
-			system "rmmod $dep\n";
+			print "$rmmod $dep\n";
+			system "$rmmod $dep\n";
 		}
 	}
 }