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/any.pm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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

diff --git a/perl-install/any.pm b/perl-install/any.pm
index c0c25ed13..ddd6379a7 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -10,14 +10,13 @@ use common;
 use detect_devices;
 use partition_table;
 use fs::type;
-use fsedit;
-use fs;
 use lang;
 use run_program;
 use keyboard;
 use devices;
 use modules;
 use log;
+use fs;
 use c;
 
 sub drakx_version() { 
@@ -159,7 +158,7 @@ sub setupBootloader__mbr_or_not {
 
 	my @l = (
 		 [ N("First sector of drive (MBR)") => '/dev/' . $hds->[0]{device} ],
-		 [ N("First sector of the root partition") => '/dev/' . fsedit::get_root($fstab, 'boot')->{device} ],
+		 [ N("First sector of the root partition") => '/dev/' . fs::get::root($fstab, 'boot')->{device} ],
 		     if_($floppy, 
                  [ N("On Floppy") => "/dev/$floppy" ],
 		     ),
@@ -265,7 +264,7 @@ sub setupBootloader__general {
     }
 
     if ($prev_clean_tmp != $clean_tmp) {
-	if ($clean_tmp && !fsedit::has_mntpoint('/tmp', $all_hds)) {
+	if ($clean_tmp && !fs::get::has_mntpoint('/tmp', $all_hds)) {
 	    push @{$all_hds->{special}}, { device => 'none', mntpoint => '/tmp', fs_type => 'tmpfs' };
 	} else {
 	    @{$all_hds->{special}} = grep { $_->{mntpoint} ne '/tmp' } @{$all_hds->{special}};
@@ -344,7 +343,7 @@ sub setupBootloader__entries {
 				  N_("Other OS (MacOS...)") : N_("Other OS (Windows...)") ]
 			       ) eq "Linux") {
 	    $e = { type => 'image',
-		   root => '/dev/' . fsedit::get_root($fstab)->{device}, #- assume a good default.
+		   root => '/dev/' . fs::get::root($fstab)->{device}, #- assume a good default.
 		 };
 	    $prefix = "linux";
 	} else {
-- 
cgit v1.2.1