summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-04-19 16:32:04 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-04-19 16:32:04 +0000
commitd88e554c03238937161200a1e940cf05114cae20 (patch)
treee8cf7b1e4ca3510fd06c59d65f18d85d004e562f
parent7ad009ba1625beb1a43f75dc527c3708b81770d1 (diff)
downloaddrakx-backup-do-not-use-d88e554c03238937161200a1e940cf05114cae20.tar
drakx-backup-do-not-use-d88e554c03238937161200a1e940cf05114cae20.tar.gz
drakx-backup-do-not-use-d88e554c03238937161200a1e940cf05114cae20.tar.bz2
drakx-backup-do-not-use-d88e554c03238937161200a1e940cf05114cae20.tar.xz
drakx-backup-do-not-use-d88e554c03238937161200a1e940cf05114cae20.zip
no_comment
-rw-r--r--perl-install/commands.pm2
-rw-r--r--perl-install/install_any.pm1
-rw-r--r--perl-install/install_steps_interactive.pm2
-rw-r--r--perl-install/modules.pm2
4 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index 09f7ecd97..ae4384b34 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -434,7 +434,7 @@ sub insmod {
}
}
-r $f or die "can't find module $_";
- run_program::run(["insmod_", "insmod"], $f, @_) or die("insmod $_ failed");
+ run_program::run(["insmod_", "insmod"], "-f", $f, @_) or die("insmod $_ failed");
unlink $f;
}
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index f6139799c..859348ac1 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -259,6 +259,7 @@ sub setPackages($) {
my @l = ();
push @l, "kapm" if $o->{pcmcia};
+ push @l, "Device3Dfx", "Glide_V3" if pci_probing::main::matching_desc('Voodoo');
require timezone;
require lang;
push @l, "isdn4k-utils" if ($o->{timezone}{timezone} || timezone::bestTimezone(lang::lang2text($o->{lang}))) =~ /Europe/;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 4b7fa5ae2..969f7b853 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -609,7 +609,7 @@ sub setRootPassword {
$o->{installClass} =~ "server" || $::expert ? "setRootPasswordMd5" : (),
$::beginner ? () : "setRootPasswordNIS");
- $o->ask_from_entries_refH([_("Set root password"), _("Ok"), $o->{security} > 2 ? () : _("No password")],
+ $o->ask_from_entries_refH([_("Set root password"), _("Ok"), $o->{security} > 2 || $::corporate ? () : _("No password")],
[ _("Set root password"),
$::beginner ? "\n" .
_("(a user ``mandrake'' with password ``mandrake'' has been automatically added)") : ()
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index afb6ecce3..e8d4563b0 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -403,7 +403,7 @@ sub load_multi {
my $cz = "/lib/modules.cz"; -e $cz or $cz .= "2";
run_program::run("extract_archive", $cz, "/tmp", map { "$_.o" } @l);
- run_program::run(["insmod_", "insmod"], "/tmp/$_.o") and $conf{$_}{loaded} = 1 foreach @l;
+ run_program::run(["insmod_", "insmod"], "-f", "/tmp/$_.o") and $conf{$_}{loaded} = 1 foreach @l;
unlink map { "/tmp/$_.o" } @l;
}