set by default the fs type and mntpoint for removables not present in fstab

(useful for harddrake)

1 files changed, 10 insertions, 0 deletions

diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake
index 54dbd7f75..9026e67ae 100755
--- a/perl-install/standalone/diskdrake
+++ b/perl-install/standalone/diskdrake
@@ -89,6 +89,16 @@ if ($type eq 'hd') {
     my ($raw_hd) = $para ?
       first(grep { $para eq $_->{device} } @{$all_hds->{raw_hds}}) || die "unknown removable $para\n" :
       $in->ask_from_listf('', '', \&diskdrake::interactive::format_raw_hd_info, $all_hds->{raw_hds}) or $in->exit(0);
+
+    if (!$raw_hd->{mntpoint}) {
+	my $mntpoint = detect_devices::suggest_mount_point($raw_hd);
+	$raw_hd->{mntpoint} ||= find { !fsedit::has_mntpoint($_, $all_hds) } map { "/mnt/$mntpoint$_" } '', 2 .. 10;
+
+	my $use_supermount = 1;
+	require security::level;
+	require lang;
+	fs::set_default_options($raw_hd, 1, $use_supermount, security::level::get(), lang::fs_options(lang::read()));
+    }
     diskdrake::removable::main($in, $all_hds, $raw_hd);
 } elsif ($type eq 'dav') {
     ($::isEmbedded, my $isEmbedded) = (0, $::isEmbedded);