summaryrefslogtreecommitdiffstats
path: root/perl-install/partition_table.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-02-28 17:46:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-02-28 17:46:52 +0000
commitdbb92fc24abd933eff171909db38d78e1d2f40c6 (patch)
treeeb4cfbfc11bec85bde725ad8d334b81f882bc403 /perl-install/partition_table.pm
parentcca75ba38464d15e685b0c2b6e2fb5e9947f61a2 (diff)
downloaddrakx-dbb92fc24abd933eff171909db38d78e1d2f40c6.tar
drakx-dbb92fc24abd933eff171909db38d78e1d2f40c6.tar.gz
drakx-dbb92fc24abd933eff171909db38d78e1d2f40c6.tar.bz2
drakx-dbb92fc24abd933eff171909db38d78e1d2f40c6.tar.xz
drakx-dbb92fc24abd933eff171909db38d78e1d2f40c6.zip
no_comment
Diffstat (limited to 'perl-install/partition_table.pm')
-rw-r--r--perl-install/partition_table.pm20
1 files changed, 5 insertions, 15 deletions
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) = @_;