summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-08-19 21:29:01 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-08-19 21:29:01 +0000
commit36d3a4fe804fb661f494d60a6969853c335b34f5 (patch)
tree65edc075f6fd40b6b41cbd532f23f388e37c5c3d /perl-install/standalone
parent94f942f169827a79ef3a2345bc41955e56c70e11 (diff)
downloaddrakx-backup-do-not-use-36d3a4fe804fb661f494d60a6969853c335b34f5.tar
drakx-backup-do-not-use-36d3a4fe804fb661f494d60a6969853c335b34f5.tar.gz
drakx-backup-do-not-use-36d3a4fe804fb661f494d60a6969853c335b34f5.tar.bz2
drakx-backup-do-not-use-36d3a4fe804fb661f494d60a6969853c335b34f5.tar.xz
drakx-backup-do-not-use-36d3a4fe804fb661f494d60a6969853c335b34f5.zip
major fs.pm rework + adaptation to it
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/diskdrake4
-rwxr-xr-xperl-install/standalone/drakboot2
2 files changed, 3 insertions, 3 deletions
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;