From f8d30c05a05c1c01b3f8a758c54f4af07d7b114e Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 3 Aug 2004 05:41:59 +0000
Subject: many functions in fsedit don't modify anything, they are simply
 accessors. create fs::get and move them into it

- device2part(), up_mount_point() moved from fs to fs::get
- part2hd(), file2part(), has_mntpoint(), mntpoint2part(), empty_all_hds() moved from fsedit to fs::get
- fsedit::get_root() -> fs::get::root()
- fsedit::get_root_() -> fs::get::root_()

- fsedit::get_really_all_fstab() -> fs::get::really_all_fstab()
- fsedit::get_all_fstab_and_holes() -> fs::get::fstab_and_holes()
- fsedit::get_all_fstab() -> fs::get::fstab()
- fsedit::get_all_holes() -> fs::get::holes()
- fsedit::all_free_space -> fs::get::free_space()
- fsedit::get_really_all_fstab() -> fs::get::really_all_fstab()

- fsedit::get_fstab_and_holes() -> fs::get::hds_fstab_and_holes()
- fsedit::get_holes() -> fs::get::hds_holes()
- fsedit::get_fstab() -> fs::get::hds_fstab()
- fsedit::free_space() -> fs::get::hds_free_space()

- fsedit::get_visible_fstab() unused, removed
---
 perl-install/loopback.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'perl-install/loopback.pm')

diff --git a/perl-install/loopback.pm b/perl-install/loopback.pm
index bdb580a8b..3be5a87bb 100644
--- a/perl-install/loopback.pm
+++ b/perl-install/loopback.pm
@@ -10,7 +10,6 @@ use MDK::Common::System;
 use common;
 use fs::type;
 use fs;
-use fsedit;
 use log;
 
 
@@ -23,14 +22,14 @@ sub carryRootLoopback {
 sub check_circular_mounts {
     my ($_hd, $part, $all_hds) = @_;
 
-    my $fstab = [ fsedit::get_all_fstab($all_hds), $part ]; # no pb if $part is already in $all_hds
+    my $fstab = [ fs::get::fstab($all_hds), $part ]; # no pb if $part is already in $all_hds
 
     my $base_mntpoint = $part->{mntpoint};
     my $check; $check = sub {
 	my ($part, @seen) = @_;
 	push @seen, $part->{mntpoint} || return;
 	@seen > 1 && $part->{mntpoint} eq $base_mntpoint and die N("Circular mounts %s\n", join(", ", @seen));
-	if (my $part = fs::up_mount_point($part->{mntpoint}, $fstab)) {
+	if (my $part = fs::get::up_mount_point($part->{mntpoint}, $fstab)) {
 	    #- '/' carrier is a special case, it will be mounted first
 	    $check->($part, @seen) if !carryRootLoopback($part);
 	}
-- 
cgit v1.2.1