summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-03-06 22:50:52 +0000
committerThierry Vignaud <tv@mageia.org>2013-03-06 22:50:52 +0000
commit093af5d3e2028fa3f4d8ceb961e3e460a01cfe74 (patch)
tree1fe2854c54db34f6c92860fafeb7c56bafc32678
parent238640510041cdb65801e362775aa0478ac82a28 (diff)
downloaddrakx-093af5d3e2028fa3f4d8ceb961e3e460a01cfe74.tar
drakx-093af5d3e2028fa3f4d8ceb961e3e460a01cfe74.tar.gz
drakx-093af5d3e2028fa3f4d8ceb961e3e460a01cfe74.tar.bz2
drakx-093af5d3e2028fa3f4d8ceb961e3e460a01cfe74.tar.xz
drakx-093af5d3e2028fa3f4d8ceb961e3e460a01cfe74.zip
use kmod's modprobe, thus fixing loading modules (mga#9270)
(it's free, just a symlink on kmod)
-rw-r--r--rescue/NEWS1
-rw-r--r--rescue/list.xml1
-rwxr-xr-xrescue/tree/sbin/modprobe18
3 files changed, 2 insertions, 18 deletions
diff --git a/rescue/NEWS b/rescue/NEWS
index 701444be2..c2fa3a035 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -1,4 +1,5 @@
- preload fuse (mga#5833)
+- use kmod's modprobe, thus fixing loading modules (mga#9270)
Version 1.39 - 3 September 2012 by Thierry Vignaud
diff --git a/rescue/list.xml b/rescue/list.xml
index 3bf73d1fa..ccedeb0aa 100644
--- a/rescue/list.xml
+++ b/rescue/list.xml
@@ -110,6 +110,7 @@
lsmod
insmod
rmmod
+ modprobe
setserial
mt stinit
diff --git a/rescue/tree/sbin/modprobe b/rescue/tree/sbin/modprobe
deleted file mode 100755
index 704ee6b0f..000000000
--- a/rescue/tree/sbin/modprobe
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/perl
-
-use lib qw(/usr/lib/libDrakX);
-use list_modules;
-use modules;
-
-# based on install::commands
-sub modprobe {
- !@_ || $_[0] =~ /^-?-h/ and die "usage: modprobe <module> [<options...>]\n";
- my $name;
- # kernel calls us with modprobe -q -- <module>, so ignore options
- do { $name = shift } while substr($name, 0, 1) eq "-";
- list_modules::load_default_moddeps();
- modules::load_with_options([ $name ], { $name => join(' ', @_) });
-}
-
-$::isInstall = 1;
-modprobe(@ARGV);