summaryrefslogtreecommitdiffstats
path: root/perl-install/diskdrake
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-06-10 04:40:18 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-06-10 04:40:18 +0000
commit6e230863720c63b6a39a53f3c0a15de771a373d2 (patch)
treed61f413104635c5a259455c4acbdc6e628650a59 /perl-install/diskdrake
parentc130de3109b46c9c0783f9d600c38cea9b5bb46e (diff)
downloaddrakx-6e230863720c63b6a39a53f3c0a15de771a373d2.tar
drakx-6e230863720c63b6a39a53f3c0a15de771a373d2.tar.gz
drakx-6e230863720c63b6a39a53f3c0a15de771a373d2.tar.bz2
drakx-6e230863720c63b6a39a53f3c0a15de771a373d2.tar.xz
drakx-6e230863720c63b6a39a53f3c0a15de771a373d2.zip
move loopback.pm to fs/loopback.pm
(since it's tightly tight to many fs* things)
Diffstat (limited to 'perl-install/diskdrake')
-rw-r--r--perl-install/diskdrake/hd_gtk.pm1
-rw-r--r--perl-install/diskdrake/interactive.pm6
2 files changed, 3 insertions, 4 deletions
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};