1 files changed, 8 insertions, 9 deletions

diff --git a/perl-install/diskdrake/removable.pm b/perl-install/diskdrake/removable.pm
index f0222d10e..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,7 +18,7 @@ sub main {
     }
 }
 
-sub actions {
+sub actions() {
     (
      N_("Mount point") => \&mount_point,
      N_("Options") => \&options,
@@ -29,7 +28,7 @@ sub actions {
 }
 
 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};
+    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 => \$type, list => [@fs], not_edit => !$::expert } ]) or return;
-    $raw_hd->{type} = $type;
+			      [ { label => N("Type"), val => \$fs_type, list => [@fs] } ]) or return;
+    $raw_hd->{fs_type} = $fs_type;
 }
 
 1;