diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-02-14 15:30:37 +0100 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-02-19 17:20:35 +0100 |
| commit | e7d014319ef21a963557473ce45adfe5b4e22131 (patch) | |
| tree | ce2a4f9cd8172308ef7a5db17a32ff2e3b8c1737 | |
| parent | dac6d01cccf8e59d9f2ef02e51cb2c0e67481951 (diff) | |
| download | drakx-e7d014319ef21a963557473ce45adfe5b4e22131.tar drakx-e7d014319ef21a963557473ce45adfe5b4e22131.tar.gz drakx-e7d014319ef21a963557473ce45adfe5b4e22131.tar.bz2 drakx-e7d014319ef21a963557473ce45adfe5b4e22131.tar.xz drakx-e7d014319ef21a963557473ce45adfe5b4e22131.zip | |
simplify
| -rw-r--r-- | perl-install/diskdrake/interactive.pm | 3 | ||||
| -rw-r--r-- | perl-install/fs/type.pm | 2 |
2 files changed, 2 insertions, 3 deletions
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 |