From 57d7910876c3175b7eaf27e62ccad2509b090b21 Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Mon, 9 Oct 2000 12:04:50 +0000 Subject: *** empty log message *** --- perl-install/ChangeLog | 5 +++++ perl-install/fs.pm | 2 +- perl-install/install_interactive.pm | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 38595c459..d7c0216b0 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -2,6 +2,11 @@ * any.pm: default speed of modem set to 115200. + * fs.pm: fixed format of RAID partition. + + * install_interactive.pm: take into account RAID partitions for + searching / partition. + 2000-10-09 DrakX * snapshot uploaded diff --git a/perl-install/fs.pm b/perl-install/fs.pm index d7bf77271..ee35ceb8d 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -136,7 +136,7 @@ sub real_format_part { } sub format_part { my ($raid, $part, $prefix) = @_; - if (isRAID($part)) { + if (isMDRAID($part)) { require raid; raid::format_part($raid, $part); } elsif (isLoopback($part)) { diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm index 633e95b0c..9746cf339 100644 --- a/perl-install/install_interactive.pm +++ b/perl-install/install_interactive.pm @@ -34,7 +34,7 @@ sub partition_with_diskdrake { require diskdrake; diskdrake::main($hds, $o->{raid}, interactive_gtk->new, $o->{partitions}, $nowizard); delete $o->{wizard} and return partitionWizard($o, 'nodiskdrake'); - my @fstab = fsedit::get_fstab(@$hds); + my @fstab = fsedit::get_fstab(@$hds, $o->{raid}); unless (fsedit::get_root_(\@fstab)) { $ok = 0; -- cgit v1.2.1