summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-28 18:08:03 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-28 18:08:03 +0000
commite94ae685f0dea15ec01eabfb18e671eb1a4ecb9e (patch)
treea72f3a9a28d05e39b6e3613c8a16fe669e841e04
parent5a04b7f1c4d52dd849dad0fc1a3aef54dd43877d (diff)
downloaddrakx-e94ae685f0dea15ec01eabfb18e671eb1a4ecb9e.tar
drakx-e94ae685f0dea15ec01eabfb18e671eb1a4ecb9e.tar.gz
drakx-e94ae685f0dea15ec01eabfb18e671eb1a4ecb9e.tar.bz2
drakx-e94ae685f0dea15ec01eabfb18e671eb1a4ecb9e.tar.xz
drakx-e94ae685f0dea15ec01eabfb18e671eb1a4ecb9e.zip
create detect_devices::suggest_mount_point and use it instead of doing it in fs::set_removable_mntpoints
-rw-r--r--perl-install/detect_devices.pm16
-rw-r--r--perl-install/fs.pm19
2 files changed, 20 insertions, 15 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index e8b728b6e..8c647bdb3 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -681,4 +681,20 @@ sub is_a_recent_computer {
$frequence > 600;
}
+sub suggest_mount_point {
+ my ($e) = @_;
+
+ my $name = $e->{media_type};
+ if (member($name, 'hd', 'fd')) {
+ if (isZipDrive($e)) {
+ $name = 'zip';
+ } elsif ($name eq 'fd') {
+ $name = 'floppy';
+ } else {
+ log::l("set_removable_mntpoints: don't know what to with hd $e->{device}");
+ }
+ }
+ $name;
+}
+
1;
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index d1d6887d7..f50418ede 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -503,21 +503,10 @@ sub set_removable_mntpoints {
my %names;
foreach (@{$all_hds->{raw_hds}}) {
- my $name = $_->{media_type};
- if (member($name, 'hd', 'fd')) {
- if (detect_devices::isZipDrive($_)) {
- $name = 'zip';
- } elsif ($name eq 'fd') {
- $name = 'floppy';
- } else {
- log::l("set_removable_mntpoints: don't know what to with hd $_->{device}");
- next;
- }
- }
- if ($name) {
- my $s = ++$names{$name};
- $_->{mntpoint} ||= "/mnt/$name" . ($s == 1 ? '' : $s);
- }
+ my $name = detect_devices::suggest_mount_point($_) or next;
+
+ my $s = ++$names{$name};
+ $_->{mntpoint} ||= "/mnt/$name" . ($s == 1 ? '' : $s);
}
}