From ebc33c17bac85e0cb5bdaf6317c4c0e04b1f7b81 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Wed, 6 Mar 2013 22:50:52 +0000
Subject: use kmod's modprobe, thus fixing loading modules (mga#9270)

(it's free, just a symlink on kmod)
---
 rescue/NEWS               |  1 +
 rescue/list.xml           |  1 +
 rescue/tree/sbin/modprobe | 18 ------------------
 3 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100755 rescue/tree/sbin/modprobe

(limited to 'rescue')

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);
-- 
cgit v1.2.1