diff options
Diffstat (limited to 'perl-install/loopback.pm')
| -rw-r--r-- | perl-install/loopback.pm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/loopback.pm b/perl-install/loopback.pm index f945adede..3be5a87bb 100644 --- a/perl-install/loopback.pm +++ b/perl-install/loopback.pm @@ -8,9 +8,8 @@ use strict; #-###################################################################################### use MDK::Common::System; use common; -use partition_table qw(:types); +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); } @@ -64,7 +63,7 @@ sub format_part { my ($part, $prefix) = @_; fs::mount_part($part->{loopback_device}, $prefix); create($part, $prefix); - fs::real_format_part($part); + fs::format::part_raw($part); } sub create { |