summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-11-16 09:31:39 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-11-16 09:31:39 +0000
commitdcbdd2aa1b731418c649d4d9c4a6148111d17ded (patch)
treebacc5ec91b8d357d28fe1ce78618280d28e5124f /perl-install
parentdd1592d64efa52c1a9be3b882e5c220bfea845e8 (diff)
downloaddrakx-dcbdd2aa1b731418c649d4d9c4a6148111d17ded.tar
drakx-dcbdd2aa1b731418c649d4d9c4a6148111d17ded.tar.gz
drakx-dcbdd2aa1b731418c649d4d9c4a6148111d17ded.tar.bz2
drakx-dcbdd2aa1b731418c649d4d9c4a6148111d17ded.tar.xz
drakx-dcbdd2aa1b731418c649d4d9c4a6148111d17ded.zip
don't use pseudo fs_type "apple" for Apple Bootstrap partitions, better only use {pt_type} for non mountable partitions
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/fs/type.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index 2caf1d803..f9ff8f618 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -32,7 +32,7 @@ if_(arch() =~ /i.86|ia64|x86_64/,
0x0b => 'vfat', 'FAT32',
),
if_(arch() =~ /ppc/,
- 0x401 => 'apple', 'Apple Bootstrap',
+ 0x401 => '', 'Apple Bootstrap',
0x402 => 'hfs', 'Apple HFS Partition',
0x41 => '', 'PPC PReP Boot',
),
@@ -316,8 +316,8 @@ sub isSwap { $_[0]{fs_type} eq 'swap' }
sub isDos { arch() !~ /^sparc/ && ${{ 1 => 1, 4 => 1, 6 => 1 }}{$_[0]{pt_type}} }
sub isFat_or_NTFS { member($_[0]{fs_type}, 'vfat', 'ntfs') }
sub isSunOS { arch() =~ /sparc/ && ${{ 0x1 => 1, 0x2 => 1, 0x4 => 1, 0x6 => 1, 0x7 => 1, 0x8 => 1 }}{$_[0]{pt_type}} }
-sub isApple { $_[0]{fs_type} eq 'apple' && defined $_[0]{isDriver} }
-sub isAppleBootstrap { $_[0]{fs_type} eq 'apple' && defined $_[0]{isBoot} }
+sub isApple { $_[0]{pt_type} == 0x401 && defined $_[0]{isDriver} }
+sub isAppleBootstrap { $_[0]{pt_type} == 0x401 && defined $_[0]{isBoot} }
sub isHiddenMacPart { defined $_[0]{isMap} }
sub isTrueFS { isTrueLocalFS($_[0]) || member($_[0]{fs_type}, qw(nfs)) }