From 8e8821f1ce8ab75f7a0c6b1e062dad8597555757 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 19 Jan 2000 04:51:33 +0000
Subject: no_comment

---
 perl-install/detect_devices.pm  | 6 +++---
 perl-install/partition_table.pm | 5 ++++-
 perl-install/raid.pm            | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index f5deb81d6..2f22a3977 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -128,9 +128,9 @@ sub getDAC960() {
     #- We are looking for lines of this format:DAC960#0:
     #- /dev/rd/c0d0: RAID-7, Online, 17928192 blocks, Write Thru0123456790123456789012
     foreach (syslog()) {
-	my ($devicename, $info) = m|/dev/rd/(.*?): (.*?),| or next;
-	push @idi, { info => $info, type => 'hd', devicename => $devicename };
-	log::l("DAC960: $devicename: $info");
+	my ($device, $info) = m|/dev/rd/(.*?): (.*?),| or next;
+	push @idi, { info => $info, type => 'hd', device => $device };
+	log::l("DAC960: $device ($info)");
     }
     @idi;
 }
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 50abce97c..c3e0da79e 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -148,6 +148,9 @@ my %type2fs = (
   0x0b => 'vfat',
   0x0c => 'vfat',
   0x0e => 'vfat',
+  0x1b => 'vfat',
+  0x1c => 'vfat',
+  0x1e => 'vfat',
   0x82 => 'swap',
   0x83 => 'ext2',
   nfs  => 'nfs', #- hack
@@ -173,7 +176,7 @@ sub isRAID($) { $_[0]{type} == 0xfd }
 sub isSwap($) { $type2fs{$_[0]{type}} eq 'swap' }
 sub isExt2($) { $type2fs{$_[0]{type}} eq 'ext2' }
 sub isDos($) { $ {{ 1=>1, 4=>1, 6=>1 }}{$_[0]{type}} }
-sub isWin($) { $ {{ 0xb=>1, 0xc=>1, 0xe=>1 }}{$_[0]{type}} }
+sub isWin($) { $ {{ 0xb=>1, 0xc=>1, 0xe=>1, 0x1b=>1, 0x1c=>1, 0x1e=>1 }}{$_[0]{type}} }
 sub isFat($) { isDos($_[0]) || isWin($_[0]) }
 sub isNfs($) { $_[0]{type} eq 'nfs' } #- small hack
 sub isSupermount($) { $_[0]{type} eq 'supermount' }
diff --git a/perl-install/raid.pm b/perl-install/raid.pm
index 2c762c025..b59b2002b 100644
--- a/perl-install/raid.pm
+++ b/perl-install/raid.pm
@@ -133,7 +133,7 @@ sub make {
 sub format_part($$) {
     my ($raid, $part) = @_;
     make($raid->{raid}, $part) if is($part);
-    fs::format_part($part, $_->{toFormatCheck} ? "-c" : ());
+    fs::format_part($part, $part->{toFormatCheck} ? "-c" : ());
     if (is($part)) {
 	$_->{isFormatted} = 1 foreach @{$part->{disks}};
     }
-- 
cgit v1.2.1