summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-02-26 21:57:29 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-02-26 21:57:29 +0000
commitb0ea54e9cce592478bac867e9315b72c1fc68b3d (patch)
tree7d32374c160ef1b4a567ef9bea8003c7e68f07ba
parentc5ab302f6d729e516f807f16f366ce660d6797f1 (diff)
downloaddrakx-backup-do-not-use-b0ea54e9cce592478bac867e9315b72c1fc68b3d.tar
drakx-backup-do-not-use-b0ea54e9cce592478bac867e9315b72c1fc68b3d.tar.gz
drakx-backup-do-not-use-b0ea54e9cce592478bac867e9315b72c1fc68b3d.tar.bz2
drakx-backup-do-not-use-b0ea54e9cce592478bac867e9315b72c1fc68b3d.tar.xz
drakx-backup-do-not-use-b0ea54e9cce592478bac867e9315b72c1fc68b3d.zip
propose some mount points for removable/nfs/smb
-rw-r--r--perl-install/diskdrake/interactive.pm4
-rw-r--r--perl-install/diskdrake/removable.pm2
-rw-r--r--perl-install/diskdrake/smbnfs_gtk.pm2
3 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 6ae73d9c5..ba53acf62 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -545,14 +545,14 @@ Remove the loopback first")), return 1;
$part->{mntpoint} = $mntpoint;
}
sub Mount_point_raw_hd {
- my ($in, $part, $all_hds) = @_;
+ my ($in, $part, $all_hds, $propositions) = @_;
my $mntpoint = $part->{mntpoint};
$in->ask_from(
'',
_("Where do you want to mount device %s?", $part->{device}),
[ { label => _("Mount point"), val => \$mntpoint,
- list => [ if_($mntpoint, $mntpoint), '' ],
+ list => [ if_($mntpoint, $mntpoint), '', @$propositions ],
not_edit => 0 } ],
complete => sub {
$part->{mntpoint} eq $mntpoint || check_mntpoint($in, $mntpoint, {}, $part, $all_hds) or return 1;
diff --git a/perl-install/diskdrake/removable.pm b/perl-install/diskdrake/removable.pm
index 4a863965f..58eb2b302 100644
--- a/perl-install/diskdrake/removable.pm
+++ b/perl-install/diskdrake/removable.pm
@@ -38,7 +38,7 @@ sub options {
}
sub mount_point {
my ($in, $raw_hd, $all_hds) = @_;
- diskdrake::interactive::Mount_point_raw_hd($in, $raw_hd, $all_hds);
+ diskdrake::interactive::Mount_point_raw_hd($in, $raw_hd, $all_hds, [ "/mnt/$raw_hd->{device}" ] );
}
sub type {
my ($in, $raw_hd) = @_;
diff --git a/perl-install/diskdrake/smbnfs_gtk.pm b/perl-install/diskdrake/smbnfs_gtk.pm
index 4ceba721a..e8519615b 100644
--- a/perl-install/diskdrake/smbnfs_gtk.pm
+++ b/perl-install/diskdrake/smbnfs_gtk.pm
@@ -54,7 +54,7 @@ sub raw_hd_options {
}
sub raw_hd_mount_point {
my ($in, $raw_hd) = @_;
- diskdrake::interactive::Mount_point_raw_hd($in, $raw_hd, $all_hds);
+ diskdrake::interactive::Mount_point_raw_hd($in, $raw_hd, $all_hds, [ "/mnt/" . lc(($raw_hd->{device} =~ /(\w+)$/)[0]) ]);
}
sub per_entry_info_box {