From 87c6698a6e18fb491e5bfec67ab5a02a6f9d3c88 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mageia.org>
Date: Sun, 8 Apr 2012 00:38:12 +0000
Subject: fix modprobe to support being called by kernel (mga#5274)

---
 rescue/NEWS               | 2 ++
 rescue/tree/sbin/modprobe | 4 ++++
 2 files changed, 6 insertions(+)

(limited to 'rescue')

diff --git a/rescue/NEWS b/rescue/NEWS
index 9e7806790..040591fa2 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -1,3 +1,5 @@
+- fix modprobe to support being called by kernel (mga#5274)
+
 Version 1.35 - 5 April 2012, by Thierry Vignaud
 
 - add chrooted rescue system in PATH
diff --git a/rescue/tree/sbin/modprobe b/rescue/tree/sbin/modprobe
index a9cd91a89..43c4a8019 100755
--- a/rescue/tree/sbin/modprobe
+++ b/rescue/tree/sbin/modprobe
@@ -7,7 +7,11 @@ use modules;
 # based on install::commands
 sub modprobe {
     !@_ || $_[0] =~ /^-?-h/ and die "usage: modprobe <module> [<options...>]\n";
+    # kernel calls us with modprobe -q -- <module>, so ignore options
     my $name = shift;
+    while (substr($name, 0, 1) eq "-") {
+	$name = shift;
+    }
     list_modules::load_default_moddeps();
     modules::load_with_options([ $name ], { $name => join(' ', @_) });
 }
-- 
cgit v1.2.1