From 36d3a4fe804fb661f494d60a6969853c335b34f5 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sun, 19 Aug 2001 21:29:01 +0000
Subject: major fs.pm rework + adaptation to it

---
 perl-install/standalone/diskdrake | 4 ++--
 perl-install/standalone/drakboot  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'perl-install/standalone')

diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake
index 930fc7fe3..9b326d388 100755
--- a/perl-install/standalone/diskdrake
+++ b/perl-install/standalone/diskdrake
@@ -67,8 +67,8 @@ my $fstab = [ fsedit::get_all_fstab($all_hds) ];
 
 fs::get_raw_hds('', $all_hds);
 
-fs::get_all_mntpoints_from_fstab($all_hds);
-fs::check_mounted($fstab);
+fs::merge_info_from_fstab([ fsedit::get_really_all_fstab($all_hds) ]);
+fs::merge_info_from_mtab([ fsedit::get_really_all_fstab($all_hds) ]);
 diskdrake_interactive::main($in, $all_hds);
 
 $in->exit(0);
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 4b8abde3c..9d159a685 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -34,7 +34,7 @@ sub lilo_choice
     
     my ($hds) = catch_cdie { fsedit::hds([ detect_devices::hds() ], {}) } sub { 1 };
     my $fstab = [ fsedit::get_fstab(@$hds) ];
-    fs::get_mntpoints_from_fstab($fstab);
+    fs::merge_info_from_fstab($fstab);
     
     $::expert=1;
     
-- 
cgit v1.2.1