summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-10-20 10:58:39 +0000
committerFrancois Pons <fpons@mandriva.com>1999-10-20 10:58:39 +0000
commit0e4618f846150e3eed750554f4371469ac1cc609 (patch)
tree19e15008d8e863b928abb89310341dc3cfd6a18f
parentcb3a724322078e12b09832edc9a61cb7d225b414 (diff)
downloaddrakx-backup-do-not-use-0e4618f846150e3eed750554f4371469ac1cc609.tar
drakx-backup-do-not-use-0e4618f846150e3eed750554f4371469ac1cc609.tar.gz
drakx-backup-do-not-use-0e4618f846150e3eed750554f4371469ac1cc609.tar.bz2
drakx-backup-do-not-use-0e4618f846150e3eed750554f4371469ac1cc609.tar.xz
drakx-backup-do-not-use-0e4618f846150e3eed750554f4371469ac1cc609.zip
*** empty log message ***
-rw-r--r--perl-install/commands.pm6
-rw-r--r--perl-install/install_steps_interactive.pm2
2 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index d86ef2c19..805647215 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -399,8 +399,10 @@ sub insmod {
require 'run_program.pm';
- unless (m|/|) {
- m/(.*)\.o/ and die "either give ./$_ or $1\n";
+ #- try to install the module if it exist else extract it from archive.
+ #- needed for cardmgr.
+ unless (-r $f) {
+ $_ = $1 if m@.*/([^/]*)\.o@;
unless (-r ($f = "/lib/modules/$_.o")) {
$f = "/tmp/$_.o";
run_program::run("cd /tmp ; bzip2 -cd /lib/modules.cpio.bz2 | cpio -i $_.o");
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 545b58481..a79132b28 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -785,7 +785,7 @@ sub load_thiskind {
my $w; #- needed to make the wait_message stay alive
my $pcmcia = $o->{pcmcia}
unless !$::beginner && modules::pcmcia_need_config($o->{pcmcia}) &&
- $o->ask_yesorno('', _("Skip PCMCIA probing", 1));
+ $o->ask_yesorno('', _("Skip %s PCMCIA probing", $type), 1);
$w = $o->wait_message(_("PCMCIA"), _("Configuring PCMCIA cards...")) if modules::pcmcia_need_config($pcmcia);
modules::load_thiskind($type, sub { $w = wait_load_module($o, $type, @_) }, $pcmcia);
}