summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-10-09 12:04:50 +0000
committerFrancois Pons <fpons@mandriva.com>2000-10-09 12:04:50 +0000
commit57d7910876c3175b7eaf27e62ccad2509b090b21 (patch)
treeed2d22628962050c83a9654f0e706bf575ec8f7d
parent0776efd0efdadd47d463698705a29e04fea6a8b2 (diff)
downloaddrakx-backup-do-not-use-57d7910876c3175b7eaf27e62ccad2509b090b21.tar
drakx-backup-do-not-use-57d7910876c3175b7eaf27e62ccad2509b090b21.tar.gz
drakx-backup-do-not-use-57d7910876c3175b7eaf27e62ccad2509b090b21.tar.bz2
drakx-backup-do-not-use-57d7910876c3175b7eaf27e62ccad2509b090b21.tar.xz
drakx-backup-do-not-use-57d7910876c3175b7eaf27e62ccad2509b090b21.zip
*** empty log message ***
-rw-r--r--perl-install/ChangeLog5
-rw-r--r--perl-install/fs.pm2
-rw-r--r--perl-install/install_interactive.pm2
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 <install@linux-mandrake.com>
* 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;