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/diskdrake/hd_gtk.pm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'perl-install/diskdrake/hd_gtk.pm')

diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index 8aff39d06..4af2a36a1 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -16,7 +16,6 @@ use raid;
 use any;
 use log;
 use fsedit;
-use fs;
 
 my ($width, $height, $minwidth) = (400, 50, 5);
 my ($all_hds, $in, $do_force_reload, $current_kind, $current_entry, $update_all);
@@ -76,7 +75,7 @@ sub main {
     $update_all = sub {
 	$lock and return;
 	$lock = 1;
-	partition_table::assign_device_numbers($_) foreach fsedit::all_hds($all_hds);
+	partition_table::assign_device_numbers($_) foreach fs::get::hds($all_hds);
 	create_automatic_notebooks($notebook_widget);
 	general_action_box($general_action_box, $nowizard, $interactive_help);
 	per_kind_action_box($per_kind_action_box, $current_kind);
@@ -217,7 +216,7 @@ sub current_kind_changed {
     my $v = $kind->{val};
     my @parts = 
       $kind->{type} eq 'raid' ? grep { $_ } @$v :
-      $kind->{type} eq 'loopback' ? @$v : fsedit::get_fstab_and_holes($v);
+      $kind->{type} eq 'loopback' ? @$v : fs::get::hds_fstab_and_holes($v);
     my $totalsectors = 
       $kind->{type} =~ /raid|loopback/ ? sum(map { $_->{size} } @parts) : $v->{totalsectors};
     create_buttons4partitions($kind, $totalsectors, @parts);
@@ -341,7 +340,7 @@ sub filesystems_button_box() {
 sub createOrChangeType {
     my ($in, $fs_type, $hd, $part, $all_hds) = @_;
 
-    $part ||= !fsedit::get_fstab($hd) && 
+    $part ||= !fs::get::hds_fstab($hd) && 
               { pt_type => 0, start => 1, size => $hd->{totalsectors} - 1 };
     $part or return;
     if ($fs_type eq 'other') {
-- 
cgit v1.2.1