summaryrefslogtreecommitdiffstats
path: root/rescue/tree/sbin
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-04-25 12:26:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-04-25 12:26:16 +0000
commit126777bc019a54afb4ec51299f2cf9d2841698aa (patch)
tree97f76e571902ead55ba138f1156a4b4f00b9b779 /rescue/tree/sbin
parentf1f67448efc714873378dfeb8279fae68054a90a (diff)
downloaddrakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar
drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.gz
drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.bz2
drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.xz
drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.zip
re-sync after the big svn loss
Diffstat (limited to 'rescue/tree/sbin')
-rwxr-xr-xrescue/tree/sbin/modprobe6
1 files changed, 3 insertions, 3 deletions
diff --git a/rescue/tree/sbin/modprobe b/rescue/tree/sbin/modprobe
index 774101d7c..b8d6aecb2 100755
--- a/rescue/tree/sbin/modprobe
+++ b/rescue/tree/sbin/modprobe
@@ -13,7 +13,7 @@ sub load_deps($) {
my ($file) = @_;
local *F;
- open F, $file or log::l("error opening $file: $!"), return 0;
+ open F, $file or warn "error opening $file: $!\n", return 0;
foreach (<F>) {
my ($f, $deps) = split ':';
push @{$deps{$f}}, split ' ', $deps;
@@ -41,7 +41,7 @@ sub load {
$conf{$name}{loaded} and return;
eval { load($_, 'prereq') } foreach @{$deps{$name}};
- system("packdrake -x /modules/modules.cz* /tmp $name$module_extension");
+ system("gzip -dc /modules/$name$module_extension.gz > /tmp/$name$module_extension");
-r "/tmp/$name$module_extension" or die "can't find module $name\n";
system("/sbin/insmod /tmp/$name$module_extension");
my $retval = $?;
@@ -49,7 +49,7 @@ sub load {
$retval and die("insmod $name failed");
}
-!@ARGV || $ARGV[0] =~ /-h/ and die "usage: modprobe <module> [<options...>]\n";
+!@ARGV || $ARGV[0] =~ /^-?-h/ and die "usage: modprobe <module> [<options...>]\n";
read_already_loaded();
load_deps("/modules/modules.dep");