summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-04-03 14:23:31 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-04-03 14:23:31 +0000
commit4ad0308a646d6d6ff38d1f8410e3ae43e0b9cabb (patch)
tree0fbde1c8c2615138dbef59381c79615379342c20 /perl-install/install_steps.pm
parent08f4b5bf2f57dc0d75dcde2cec410a16e1f65f20 (diff)
downloaddrakx-4ad0308a646d6d6ff38d1f8410e3ae43e0b9cabb.tar
drakx-4ad0308a646d6d6ff38d1f8410e3ae43e0b9cabb.tar.gz
drakx-4ad0308a646d6d6ff38d1f8410e3ae43e0b9cabb.tar.bz2
drakx-4ad0308a646d6d6ff38d1f8410e3ae43e0b9cabb.tar.xz
drakx-4ad0308a646d6d6ff38d1f8410e3ae43e0b9cabb.zip
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index df04546d5..34f18407e 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -114,8 +114,7 @@ sub selectInstallClass($@) {
}
#------------------------------------------------------------------------------
sub setupSCSI {
- modules::load("ide-mod", 'prereq', 'options="' . detect_devices::hasUltra66() . '"');
- modules::load_multi(qw(ide-probe ide-disk ide-cd));
+ modules::load_ide();
modules::load_thiskind('scsi');
}
#------------------------------------------------------------------------------
@@ -429,7 +428,7 @@ sub pppConfig {
print F "nameserver $o->{modem}{dns2}\n" if $o->{modem}{dns2};
close F;
- install_any::template2userfile($o->{prefix}, "/usr/share/kppprc.in", ".kde/share/config/kppprc", 1, %toreplace);
+ install_any::template2userfile($o->{prefix}, "$ENV{SHARE_PATH}/kppprc.in", ".kde/share/config/kppprc", 1, %toreplace);
miscellaneousNetwork($o);
}
@@ -762,10 +761,11 @@ sub miscellaneous {
$_ .= " mem=$ramsize";
}
if (my @l = detect_devices::getIDEBurners() and !/ide-scsi/) {
- $_ .= " " . join(" ", map { "$_=ide-scsi" } @l);
+ $_ .= " " . join(" ", (map { "$_=ide-scsi" } @l),
+ map { "$_->{device}=ide-floppy" } detect_devices::ide_zips());
}
- if (my $m = modules::get_options("ide-mod")) {
- $m =~ /options="(.*)"/ and $_ .= " $1" if !/ide.=/;
+ if (my $m = detect_devices::hasUltra66()) {
+ $_ .= " $m" if !/ide.=/;
}
#- keep some given parameters