summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-02-28 13:06:28 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-02-28 13:06:28 +0000
commit7b5d06903b6348b4e130a6ec2034e5d4a0c94819 (patch)
treea39e92d9119f8130b1fd6e7a3658f97a9a7bf44b
parent4a8a354e7c57ad5a37811b7a031b930373fd85b2 (diff)
downloaddrakx-7b5d06903b6348b4e130a6ec2034e5d4a0c94819.tar
drakx-7b5d06903b6348b4e130a6ec2034e5d4a0c94819.tar.gz
drakx-7b5d06903b6348b4e130a6ec2034e5d4a0c94819.tar.bz2
drakx-7b5d06903b6348b4e130a6ec2034e5d4a0c94819.tar.xz
drakx-7b5d06903b6348b4e130a6ec2034e5d4a0c94819.zip
use the "soft" option by default for /mnt/nfs and for "diskdrake --nfs"
-rw-r--r--perl-install/fs.pm2
-rw-r--r--perl-install/install_steps.pm2
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" };
}
#------------------------------------------------------------------------------