From 6e230863720c63b6a39a53f3c0a15de771a373d2 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 10 Jun 2005 04:40:18 +0000
Subject: move loopback.pm to fs/loopback.pm (since it's tightly tight to many
 fs* things)

---
 perl-install/diskdrake/hd_gtk.pm      | 1 -
 perl-install/diskdrake/interactive.pm | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'perl-install/diskdrake')

diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index 036bfff85..95860d7e5 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -10,7 +10,6 @@ use fs::type;
 use detect_devices;
 use diskdrake::interactive;
 use run_program;
-use loopback;
 use devices;
 use raid;
 use any;
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index bb414f451..f7bcc9348 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -9,7 +9,7 @@ use partition_table;
 use partition_table::raw;
 use detect_devices;
 use run_program;
-use loopback;
+use fs::loopback;
 use devices;
 use fsedit;
 use raid;
@@ -902,7 +902,7 @@ sub Loopback {
 
     my $handle = any::inspect($real_part) or $in->ask_warn('', N("This partition can not be used for loopback")), return;
 
-    my ($min, $max) = (1, loopback::getFree($handle->{dir}, $real_part));
+    my ($min, $max) = (1, fs::loopback::getFree($handle->{dir}, $real_part));
     $max = min($max, 1 << (31 - 9)) if $real_part->{fs_type} eq 'vfat'; #- FAT does not handle file size bigger than 2GB
     my $part = { maxsize => $max, size => 0, loopback_device => $real_part, notFormatted => 1 };
     if (!fsedit::suggest_part($part, $all_hds)) {
@@ -921,7 +921,7 @@ sub Loopback {
 	     complete => sub {
 		 $part->{loopback_file} or $in->ask_warn('', N("Give a file name")), return 1, 0;
 		 $part->{loopback_file} =~ s|^([^/])|/$1|;
-		 if (my $size = loopback::verifFile($handle->{dir}, $part->{loopback_file}, $real_part)) {
+		 if (my $size = fs::loopback::verifFile($handle->{dir}, $part->{loopback_file}, $real_part)) {
 		     $size == -1 and $in->ask_warn('', N("File is already used by another loopback, choose another one")), return 1, 0;
 		     $in->ask_yesorno('', N("File already exists. Use it?")) or return 1, 0;
 		     delete $part->{notFormatted};
-- 
cgit v1.2.1