diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-06-07 01:39:20 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-06-07 01:39:20 +0000 |
| commit | fb43d5660d8ef1948a52d9321407e89d4a45f953 (patch) | |
| tree | 98dafdccf189e5111d7b11aa0caa1a01ff0b14f7 | |
| parent | d181afff557d7423968f867bdef4f19b2a6f4100 (diff) | |
| download | drakx-fb43d5660d8ef1948a52d9321407e89d4a45f953.tar drakx-fb43d5660d8ef1948a52d9321407e89d4a45f953.tar.gz drakx-fb43d5660d8ef1948a52d9321407e89d4a45f953.tar.bz2 drakx-fb43d5660d8ef1948a52d9321407e89d4a45f953.tar.xz drakx-fb43d5660d8ef1948a52d9321407e89d4a45f953.zip | |
handle nfs mount (since we now use the /bin/mount instead of the syscall, we get it for free)
| -rw-r--r-- | perl-install/fs.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm index d1580068c..cb38f6419 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -484,10 +484,10 @@ sub mount { $fs or log::l("not mounting $dev partition"), return; { - my @fs_modules = qw(ext3 hfs jfs ntfs romfs reiserfs ufs xfs vfat); + my @fs_modules = qw(ext3 hfs jfs nfs ntfs romfs reiserfs ufs xfs vfat); my @types = (qw(ext2 proc sysfs usbfs usbdevfs iso9660 devfs devpts), @fs_modules); - push @types, 'smb', 'smbfs', 'nfs', 'davfs' if !$::isInstall; + push @types, 'smb', 'smbfs', 'davfs' if !$::isInstall; if (!member($fs, @types) && !$::move) { log::l("skipping mounting $dev partition ($fs)"); @@ -508,6 +508,8 @@ sub mount { if ($fs eq 'vfat') { @mount_opt = 'check=relaxed'; + } elsif ($fs eq 'nfs') { + push @mount_opt, 'nolock' if $::isInstall; } elsif ($fs eq 'jfs' && !$b_rdonly) { fsck_jfs($dev, $o_wait_message); } elsif ($fs eq 'ext2' && !$b_rdonly) { |