summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-10-04 00:30:29 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-10-04 00:30:29 +0000
commit1237406e5ee90da9dbdfec9fce21d603f75c80a6 (patch)
treef9b071d99afeccf9ef1c029cd08724b24919d91f /perl-install/install_any.pm
parenta8fff3fb88fd5d727ab14812673dbed47541593e (diff)
downloaddrakx-1237406e5ee90da9dbdfec9fce21d603f75c80a6.tar
drakx-1237406e5ee90da9dbdfec9fce21d603f75c80a6.tar.gz
drakx-1237406e5ee90da9dbdfec9fce21d603f75c80a6.tar.bz2
drakx-1237406e5ee90da9dbdfec9fce21d603f75c80a6.tar.xz
drakx-1237406e5ee90da9dbdfec9fce21d603f75c80a6.zip
no_comment
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index e2aa3ee57..11a80e9a6 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -287,7 +287,7 @@ sub setPackages($) {
push @{$o->{default_packages}}, "apmd" if $o->{pcmcia};
push @{$o->{default_packages}}, "raidtools" if $o->{raid} && !is_empty_array_ref($o->{raid}{raid});
push @{$o->{default_packages}}, "reiserfs-utils" if grep { isReiserfs($_) } @{$o->{fstab}};
- push @{$o->{default_packages}}, "cdrecord" if detect_devices::getIDEBurners();
+ push @{$o->{default_packages}}, "cdrecord" if detect_devices::burners();
push @{$o->{default_packages}}, "alsa", "alsa-utils" if modules::get_alias("snd-slot-0") =~ /^snd-card-/;
pkgs::getDeps($o->{prefix}, $o->{packages});
@@ -564,7 +564,7 @@ sub loadO {
if ($f =~ /^(floppy|patch)$/) {
my $f = $f eq "floppy" ? 'Mandrake/base/auto_inst.cfg' : "patch";
unless ($::testing) {
- fs::mount(devices::make("fd0"), "/mnt", (arch() =~ /sparc/ ? "romfs" : "vfat"), 'readonly');
+ fs::mount(devices::make(detect_devices::floppy()), "/mnt", (arch() =~ /sparc/ ? "romfs" : "vfat"), 'readonly');
$f = "/mnt/$f";
}
-e $f or $f .= '.pl';