From 4754dfeb3a7869aac8cc21e5049fddb010cc0ecc Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 2 Aug 2004 08:10:53 +0000
Subject: fsedit::check_fs_type() is now fs::type::check()

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

(limited to 'perl-install')

diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index c5bbccdff..53f006b87 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -1021,7 +1021,7 @@ sub partitions_suggestions {
 
 sub check_type {
     my ($in, $type, $hd, $part) = @_;
-    eval { fsedit::check_fs_type($type->{fs_type}, $hd, $part) };
+    eval { fs::type::check($type->{fs_type}, $hd, $part) };
     if (my $err = $@) {
 	$in->ask_warn('', formatError($err));
 	return;
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index 80116b51c..70e388177 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -332,3 +332,10 @@ sub set_isFormatted {
     delete $part->{bad_fs_type_magic};
     delete $part->{fs_type_from_magic};
 }
+
+#- do this before modifying $part->{fs_type}
+sub check {
+    my ($fs_type, $_hd, $part) = @_;
+    $fs_type eq "jfs" && $part->{size} < 16 << 11 and die N("You can't use JFS for partitions smaller than 16MB");
+    $fs_type eq "reiserfs" && $part->{size} < 32 << 11 and die N("You can't use ReiserFS for partitions smaller than 32MB");
+}
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 39797a773..26051f800 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -516,13 +516,6 @@ sub get_root_ {
 }
 sub get_root { &get_root_ || {} }
 
-#- do this before modifying $part->{fs_type}
-sub check_fs_type {
-    my ($fs_type, $_hd, $part) = @_;
-    $fs_type eq "jfs" && $part->{size} < 16 << 11 and die N("You can't use JFS for partitions smaller than 16MB");
-    $fs_type eq "reiserfs" && $part->{size} < 32 << 11 and die N("You can't use ReiserFS for partitions smaller than 32MB");
-}
-
 #- you can do this before modifying $part->{mntpoint}
 #- so $part->{mntpoint} should not be used here, use $mntpoint instead
 sub check_mntpoint {
@@ -752,7 +745,7 @@ sub move {
 sub change_type {
     my ($type, $hd, $part) = @_;
     $type->{pt_type} != $part->{pt_type} || $type->{fs_type} ne $part->{fs_type} or return;
-    check_fs_type($type->{fs_type}, $hd, $part);
+    fs::type::check($type->{fs_type}, $hd, $part);
     $hd->{isDirty} = 1;
     $part->{mntpoint} = '' if isSwap($part) && $part->{mntpoint} eq "swap";
     $part->{mntpoint} = '' if isRawLVM($type) || isRawRAID($type);
-- 
cgit v1.2.1