From 1294daaae9eeece73029f63e425f1c17ccffe61f Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sun, 7 Jul 2002 13:18:31 +0000
Subject: for greater symmetry with smb, drop isNfs in favour of
 isThisFs('nfs', ...)

---
 perl-install/fs.pm              | 6 +++---
 perl-install/partition_table.pm | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index fbfc37cf2..10da0e72c 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -132,7 +132,7 @@ sub add2all_hds {
 
     foreach (@l) {
 	my $s = 
-	    isNfs($_) ? 'nfss' :
+	    isThisFs('nfs', $_) ? 'nfss' :
 	    isThisFs('smbfs', $_) ? 'smbs' :
 	    'special';
 	push @{$all_hds->{$s}}, $_;
@@ -436,7 +436,7 @@ sub set_default_options {
 	#- news spool to speed up news servers).
 	$options->{noatime} = detect_devices::isLaptop();
     }
-    if (isNfs($part)) {
+    if (isThisFs('nfs', $part)) {
 	put_in_hash($options, { 
 			       nosuid => 1, 'rsize=8192,wsize=8192' => 1, soft => 1,
 			      });
@@ -525,7 +525,7 @@ sub get_raw_hds {
     get_major_minor(@{$all_hds->{raw_hds}});
 
     my @fstab = read_fstab($prefix, "/etc/fstab", 'all_options');
-    $all_hds->{nfss} = [ grep { isNfs($_) } @fstab ];
+    $all_hds->{nfss} = [ grep { isThisFs('nfs', $_) } @fstab ];
     $all_hds->{smbs} = [ grep { isThisFs('smbfs', $_) } @fstab ];
     $all_hds->{special} = [
        (grep { isThisFs('tmpfs', $_) } @fstab),
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index d89269b93..2feb0faf3 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -6,7 +6,7 @@ use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK @important_types @important_types2 @fie
 
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
-    types => [ qw(type2name type2fs name2type fs2type isExtended isExt2 isThisFs isTrueFS isSwap isDos isWin isFat isSunOS isOtherAvailableFS isPrimary isNfs isRawLVM isRawRAID isRAID isLVM isNT isMountableRW isNonMountable isPartOfLVM isPartOfRAID isPartOfLoopback isApplePartMap isLoopback isMounted isBusy isSpecial maybeFormatted isApple isAppleBootstrap) ],
+    types => [ qw(type2name type2fs name2type fs2type isExtended isExt2 isThisFs isTrueFS isSwap isDos isWin isFat isSunOS isOtherAvailableFS isPrimary isRawLVM isRawRAID isRAID isLVM isNT isMountableRW isNonMountable isPartOfLVM isPartOfRAID isPartOfLoopback isApplePartMap isLoopback isMounted isBusy isSpecial maybeFormatted isApple isAppleBootstrap) ],
 );
 @EXPORT_OK = map { @$_ } values %EXPORT_TAGS;
 
@@ -235,7 +235,6 @@ sub isDos { arch() !~ /^sparc/ && $ {{ 1=>1, 4=>1, 6=>1 }}{$_[0]{type}} }
 sub isWin { $ {{ 0xb=>1, 0xc=>1, 0xe=>1, 0x1b=>1, 0x1c=>1, 0x1e=>1 }}{$_[0]{type}} }
 sub isFat { isDos($_[0]) || isWin($_[0]) }
 sub isSunOS { arch() =~ /sparc/ && $ {{ 0x1=>1, 0x2=>1, 0x4=>1, 0x6=>1, 0x7=>1, 0x8=>1 }}{$_[0]{type}} }
-sub isNfs { $_[0]{type} eq 'nfs' }
 sub isNT { arch() !~ /^sparc/ && $_[0]{type} == 0x7 }
 sub isApple { type2fs($_[0]) eq 'apple' && defined $_[0]{isDriver} }
 sub isAppleBootstrap { type2fs($_[0]) eq 'apple' && defined $_[0]{isBoot} }
-- 
cgit v1.2.1