1 files changed, 14 insertions, 15 deletions

diff --git a/perl-install/diskdrake/removable.pm b/perl-install/diskdrake/removable.pm
index 58eb2b302..f3b73ed4b 100644
--- a/perl-install/diskdrake/removable.pm
+++ b/perl-install/diskdrake/removable.pm
@@ -1,10 +1,9 @@
-package diskdrake::removable; # $Id$
+package diskdrake::removable;
 
 use diagnostics;
 use strict;
 use diskdrake::interactive;
 use common;
-use fsedit;
 use fs;
 
 sub main {
@@ -19,17 +18,17 @@ sub main {
     }
 }
 
-sub actions {
+sub actions() {
     (
-     __("Mount point") => \&mount_point,
-     __("Options") => \&options,
-     __("Type") => \&type,
-     __("Done") => \&done,
+     N_("Mount point") => \&mount_point,
+     N_("Options") => \&options,
+     N_("Type") => \&type,
+     N_("Done") => \&done,
     );
 }
 
 sub done {
-    my ($in, $raw_hd, $all_hds) = @_;
+    my ($in, $_raw_hd, $all_hds) = @_;
     diskdrake::interactive::Done($in, $all_hds);
 }
 sub options {
@@ -38,16 +37,16 @@ sub options {
 }
 sub mount_point { 
     my ($in, $raw_hd, $all_hds) = @_;
-    diskdrake::interactive::Mount_point_raw_hd($in, $raw_hd, $all_hds, [ "/mnt/$raw_hd->{device}" ] );
+    diskdrake::interactive::Mount_point_raw_hd($in, $raw_hd, $all_hds, "/media/$raw_hd->{device}");
 }
 sub type {
     my ($in, $raw_hd) = @_;
-    my @fs = ('auto', fs::auto_fs());
-    my $type = $raw_hd->{type};
-    $in->ask_from(_("Change type"),
-			      _("Which filesystem do you want?"),
-			      [ { label => _("Type"), val => \$type, list => [@fs], not_edit => !$::expert } ]) or return;
-    $raw_hd->{type} = $type;
+    my @fs = ('auto', fs::type::guessed_by_mount());
+    my $fs_type = $raw_hd->{fs_type};
+    $in->ask_from(N("Change type"),
+			      N("Which filesystem do you want?"),
+			      [ { label => N("Type"), val => \$fs_type, list => [@fs] } ]) or return;
+    $raw_hd->{fs_type} = $fs_type;
 }
 
 1;