diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2009-02-13 13:58:18 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2009-02-13 13:58:18 +0000 |
| commit | cb57100088e9f741c80d7eca8caa377af79460dd (patch) | |
| tree | d5156edf6b0c66e57d2899b8f3713a5892bb5373 | |
| parent | 451a8bcd5311b06cacb1c009b3068e6312dae540 (diff) | |
| download | drakx-cb57100088e9f741c80d7eca8caa377af79460dd.tar drakx-cb57100088e9f741c80d7eca8caa377af79460dd.tar.gz drakx-cb57100088e9f741c80d7eca8caa377af79460dd.tar.bz2 drakx-cb57100088e9f741c80d7eca8caa377af79460dd.tar.xz drakx-cb57100088e9f741c80d7eca8caa377af79460dd.zip | |
diskdrake: allow resizing on lvm for mounted ext3/4 and not mounted xfs
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/diskdrake/interactive.pm | 2 | ||||
| -rw-r--r-- | perl-install/fs.pm | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index c2b8faaf5..ce39511bf 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- diskdrake: + o allow resizing on lvm for mounted ext3/4 and not mounted xfs + Version 11.86 - 12 February 2009 - diskdrake: diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index c68c9a25b..a0d912ec3 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -421,7 +421,7 @@ sub part_possible_actions { my %macros = ( readonly => '$hd->{readonly}', hasMntpoint => '$part->{mntpoint}', - LVM_resizable => '$part->{fs_type} eq "reiserfs" || (isMounted ? $part->{fs_type} eq "xfs" : member($part->{fs_type}, qw(ext3 ext4)))', + LVM_resizable => 'member($part->{fs_type}, qw(reiserfs xfs ext3 ext4))', canModifyRAID => 'isPartOfRAID($part) && !isMounted(fs::get::device2part($part->{raid}, $all_hds->{raids}))', ); if (isEmpty($part)) { diff --git a/perl-install/fs.pm b/perl-install/fs.pm index d95890cb3..07a23408a 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -232,7 +232,10 @@ sub prepare_write_fstab { my ($freq, $passno) = exists $_->{freq} ? ($_->{freq}, $_->{passno}) : - isTrueLocalFS($_) && !$_->{dmcrypt_name} && $_->{options} !~ /encryption=/ && (!$_->{is_removable} || member($_->{mntpoint}, fs::type::directories_needed_to_boot())) ? + isTrueLocalFS($_) && !$_->{dmcrypt_name} + && $_->{options} !~ /encryption=/ + && $_->{options} !~ /noauto/ + && (!$_->{is_removable} || member($_->{mntpoint}, fs::type::directories_needed_to_boot())) ? (1, $_->{mntpoint} eq '/' ? 1 : fs::type::carry_root_loopback($_) ? 0 : 2) : (0, 0); |