summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-03-07 14:14:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-03-07 14:14:16 +0000
commit87e17eadc4e88a810fa54b3e897622103e42fd99 (patch)
tree0d355c87b218a8d7f66e4c8a2b869890db999185
parent8986c670e7a401e0cc0df145cd6a53cd7d8b5ce4 (diff)
downloaddrakx-87e17eadc4e88a810fa54b3e897622103e42fd99.tar
drakx-87e17eadc4e88a810fa54b3e897622103e42fd99.tar.gz
drakx-87e17eadc4e88a810fa54b3e897622103e42fd99.tar.bz2
drakx-87e17eadc4e88a810fa54b3e897622103e42fd99.tar.xz
drakx-87e17eadc4e88a810fa54b3e897622103e42fd99.zip
allow live resizing of reiserfs on lvm (as tested by Gaetan Lehmann). not tested
-rw-r--r--perl-install/diskdrake/interactive.pm7
1 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index a0602bbb3..ef78889a1 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -435,7 +435,7 @@ sub part_possible_actions {
N_("Mount point") => '$part->{real_mntpoint} || (!isBusy && !isSwap && !isNonMountable)',
N_("Type") => '!isBusy && $::expert && (!readonly || $part->{pt_type} == 0x83)',
N_("Options") => '$::expert',
- N_("Resize") => '!isBusy && !readonly && !isSpecial || isLVM($hd) && isMounted && $part->{fs_type} eq "xfs"',
+ N_("Resize") => '!isBusy && !readonly && !isSpecial || isLVM($hd) && isMounted && ($part->{fs_type} eq "xfs" || $part->{fs_type} eq "reiserfs")',
N_("Format") => '!isBusy && !readonly && ($::expert || $::isStandalone)',
N_("Mount") => '!isBusy && (hasMntpoint || isSwap) && maybeFormatted && ($::expert || $::isStandalone)',
N_("Add to RAID") => '!isBusy && isRawRAID && (!isSpecial || isRAID)',
@@ -718,7 +718,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;
- if (defined(my $free = fs::df($part))) {
+ 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);
}