From 649015ba83578ac4a5b89242ccb1a50c630afa4f Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 28 Aug 2002 09:30:02 +0000
Subject: in "Mount point", by default choose the default proposition (asked by
 dadou for smb)

---
 perl-install/diskdrake/dav.pm         | 2 +-
 perl-install/diskdrake/interactive.pm | 6 +++---
 perl-install/diskdrake/removable.pm   | 2 +-
 perl-install/diskdrake/smbnfs_gtk.pm  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/perl-install/diskdrake/dav.pm b/perl-install/diskdrake/dav.pm
index 38dcfc8a2..13f6e09fa 100644
--- a/perl-install/diskdrake/dav.pm
+++ b/perl-install/diskdrake/dav.pm
@@ -82,7 +82,7 @@ sub options {
 sub mount_point { 
     my ($in, $dav, $all_hds) = @_;
     my $proposition = $dav->{device} =~ /(\w+)/ ? "/mnt/$1" : "/mnt/dav";
-    diskdrake::interactive::Mount_point_raw_hd($in, $dav, $all_hds, [$proposition] );
+    diskdrake::interactive::Mount_point_raw_hd($in, $dav, $all_hds, $proposition);
 }
 
 sub format_dav_info {
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index a30d32b45..6d482e8af 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -586,14 +586,14 @@ Remove the loopback first")), return 1;
     }
 }
 sub Mount_point_raw_hd {
-    my ($in, $part, $all_hds, $propositions) = @_;
+    my ($in, $part, $all_hds, @propositions) = @_;
 
-    my $mntpoint = $part->{mntpoint};
+    my $mntpoint = $part->{mntpoint} || shift @propositions;
     $in->ask_from(
         '',
         _("Where do you want to mount %s?", $part->{device}),
 	[ { label => _("Mount point"), val => \$mntpoint, 
-	    list => [ if_($mntpoint, $mntpoint), '', @$propositions ], 
+	    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 58eb2b302..f781f43d0 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, [ "/mnt/$raw_hd->{device}" ] );
+    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 862132d05..d16bba988 100644
--- a/perl-install/diskdrake/smbnfs_gtk.pm
+++ b/perl-install/diskdrake/smbnfs_gtk.pm
@@ -56,7 +56,7 @@ sub raw_hd_mount_point {
     my ($in, $raw_hd) = @_;
     my ($default) = $raw_hd->{device} =~ m|([^/]+)$|;
     $default =~ s/\s+/-/g;
-    diskdrake::interactive::Mount_point_raw_hd($in, $raw_hd, $all_hds, [ "/mnt/$default" ]);
+    diskdrake::interactive::Mount_point_raw_hd($in, $raw_hd, $all_hds, "/mnt/$default");
 }
 
 sub per_entry_info_box {
-- 
cgit v1.2.1