From 7b5d06903b6348b4e130a6ec2034e5d4a0c94819 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 28 Feb 2002 13:06:28 +0000
Subject: use the "soft" option by default for /mnt/nfs and for "diskdrake
 --nfs"

---
 perl-install/fs.pm            | 2 +-
 perl-install/install_steps.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 6ae9239fa..e15721224 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -364,7 +364,7 @@ sub set_default_options {
     }
     if (isNfs($part)) {
 	put_in_hash($options, { 
-			       nosuid => 1, 'rsize=8192,wsize=8192' => 1,
+			       nosuid => 1, 'rsize=8192,wsize=8192' => 1, soft => 1,
 			      });
     }
     if (isFat($part) || $is_auto) {
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index f0973f5e6..855bbce5e 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -168,7 +168,7 @@ sub doPartitionDisksAfter {
 
     cat_("/proc/mounts") =~ m|(\S+)\s+/tmp/image nfs| &&
       !grep { $_->{mntpoint} eq "/mnt/nfs" } @{$o->{all_hds}{nfss}} and
-	push @{$o->{all_hds}{nfss}}, { type => 'nfs', mntpoint => "/mnt/nfs", device => $1, options => "noauto,ro,nosuid,rsize=8192,wsize=8192" };
+	push @{$o->{all_hds}{nfss}}, { type => 'nfs', mntpoint => "/mnt/nfs", device => $1, options => "noauto,ro,nosuid,soft,rsize=8192,wsize=8192" };
 }
 
 #------------------------------------------------------------------------------
-- 
cgit v1.2.1