From e7d014319ef21a963557473ce45adfe5b4e22131 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 14 Feb 2020 15:30:37 +0100
Subject: simplify

---
 perl-install/diskdrake/interactive.pm | 3 +--
 perl-install/fs/type.pm               | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 0b1ed6b44..3bdfdce22 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -797,11 +797,10 @@ sub Resize {
 	    $min = $nice_resize{ntfs}->min_size or delete $nice_resize{ntfs};
 	} elsif ($part->{fs_type} eq 'reiserfs') {
 	    write_partitions($in, $hd) or return;
+	    $nice_resize{reiserfs} = 1;
 	    if ($part->{isMounted}) {
-		$nice_resize{reiserfs} = 1;
 		$min = $part->{size}; #- ensure the user can only increase
 	    } elsif (defined(my $free = fs::df($part))) {
-		$nice_resize{reiserfs} = 1;
 		$min = max($min, $part->{size} - $free);
 	    }
 	} elsif ($part->{fs_type} eq 'xfs' && isLVM($hd) && $::isStandalone && $part->{isMounted}) {
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index 0492420e8..b9f4b48d6 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -320,7 +320,7 @@ sub isRecovery {
     );
 }
 
-sub isTrueFS { isTrueLocalFS($_[0]) || member($_[0]{fs_type}, qw(nfs)) }
+sub isTrueFS { isTrueLocalFS($_[0]) || $_[0]{fs_type} eq 'nfs' }
 sub isTrueLocalFS { member($_[0]{fs_type}, true_local_fs_types()) }
 
 sub isOtherAvailableFS { isESP($_[0]) || isFat_or_NTFS($_[0]) || member($_[0]{fs_type}, 'ufs', 'hfs', 'iso9660') } #- other OS that linux can access its filesystem
-- 
cgit v1.2.1