From cb57100088e9f741c80d7eca8caa377af79460dd Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mandriva.org>
Date: Fri, 13 Feb 2009 13:58:18 +0000
Subject: diskdrake: allow resizing on lvm for mounted ext3/4 and not mounted
 xfs

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

(limited to 'perl-install')

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);
 
-- 
cgit v1.2.1