From dbb92fc24abd933eff171909db38d78e1d2f40c6 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 28 Feb 2000 17:46:52 +0000
Subject: no_comment

---
 perl-install/partition_table.pm | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'perl-install/partition_table.pm')

diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 136d6c500..586d85f26 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -28,6 +28,10 @@ use log;
 
 my %types = (
   0x0 => 'Empty',
+arch() =~ /^ppc/ ? (
+  0x401	=> 'Apple Partition',
+  0x402	=> 'Apple HFS Partition',
+) : (),
 arch() =~ /^sparc/ ? (
   0x1 => 'SunOS boot',
   0x2 => 'SunOS root',
@@ -153,15 +157,6 @@ arch() =~ /^sparc/ ? (
   0xff => 'Xenix Bad Block Table',
 );
 
-if (arch() eq "ppc") {
-%types = (
-  0x82 => 'Linux swap',
-  0x83 => 'Linux native',
-  0x401	=> 'Apple Partition',
-  0x402	=> 'Apple HFS Partition',
-);
-}
-
 my %type2fs = (
 arch() !~ /^sparc/ ? (
   0x01 => 'vfat',
@@ -209,7 +204,7 @@ sub isFat($) { isDos($_[0]) || isWin($_[0]) }
 sub isNfs($) { $_[0]{type} eq 'nfs' } #- small hack
 sub isSupermount($) { $_[0]{type} eq 'supermount' }
 sub isHFS($) { $type2fs{$_[0]{type}} eq 'hfs' }
-sub isApplePartMap { defined $_[0]->{isMap} }
+sub isApplePartMap { defined $_[0]{isMap} }
 
 sub isPrimary($$) {
     my ($part, $hd) = @_;
@@ -384,11 +379,6 @@ sub read($;$) {
     1;
 }
 
-sub read_and_clear($) {
-    my ($hd) = @_;
-    partition_table::read($hd, 1);
-}
-
 sub read_extended {
     my ($hd, $extended) = @_;
 
-- 
cgit v1.2.1