diff options
| author | Erwan Velu <erwan@mandriva.org> | 2003-02-26 11:34:46 +0000 |
|---|---|---|
| committer | Erwan Velu <erwan@mandriva.org> | 2003-02-26 11:34:46 +0000 |
| commit | ae07b9b38964e0f23bc1f0ec28af8add8a38d705 (patch) | |
| tree | 01f45015109bb34de01738979aa88702e6208e91 | |
| parent | b090bb15df2ec04681178ca9131b9c646fdffd05 (diff) | |
| download | drakx-backup-do-not-use-ae07b9b38964e0f23bc1f0ec28af8add8a38d705.tar drakx-backup-do-not-use-ae07b9b38964e0f23bc1f0ec28af8add8a38d705.tar.gz drakx-backup-do-not-use-ae07b9b38964e0f23bc1f0ec28af8add8a38d705.tar.bz2 drakx-backup-do-not-use-ae07b9b38964e0f23bc1f0ec28af8add8a38d705.tar.xz drakx-backup-do-not-use-ae07b9b38964e0f23bc1f0ec28af8add8a38d705.zip | |
merging ia64
| -rw-r--r-- | perl-install/partition_table.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm index c83cd1272..242c7a662 100644 --- a/perl-install/partition_table.pm +++ b/perl-install/partition_table.pm @@ -6,7 +6,7 @@ use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK @important_types @important_types2 @fie @ISA = qw(Exporter); %EXPORT_TAGS = ( - types => [ qw(type2name type2fs name2type fs2type isExtended isExt2 isThisFs isTrueFS isSwap isDos isWin isFat isSunOS isOtherAvailableFS isPrimary isRawLVM isRawRAID isRAID isLVM isNT isMountableRW isNonMountable isPartOfLVM isPartOfRAID isPartOfLoopback isApplePartMap isLoopback isMounted isBusy isSpecial maybeFormatted isApple isAppleBootstrap) ], + types => [ qw(type2name type2fs name2type fs2type isExtended isExt2 isThisFs isTrueFS isSwap isDos isWin isFat isSunOS isOtherAvailableFS isPrimary isRawLVM isRawRAID isRAID isLVM isNT isMountableRW isNonMountable isPartOfLVM isPartOfRAID isPartOfLoopback isApplePartMap isLoopback isMounted isBusy isSpecial maybeFormatted isApple isAppleBootstrap isEfi) ], ); @EXPORT_OK = map { @$_ } values %EXPORT_TAGS; @@ -203,6 +203,7 @@ arch() !~ /sparc/ ? ( 0x1e => 'vfat', 0x82 => 'swap', 0x83 => 'ext2', + 0xef => 'vfat', 0x183=> 'reiserfs', 0x283=> 'xfs', 0x383=> 'jfs', @@ -230,6 +231,7 @@ sub name2type { /0x(.*)/ ? hex $1 : $types_rev{$_} || $_; } +sub isEfi { arch() =~ /ia64/ && $_[0]{type} == 0xef } sub isWholedisk { arch() =~ /^sparc/ && $_[0]{type} == 5 } sub isExtended { arch() !~ /^sparc/ && ($_[0]{type} == 5 || $_[0]{type} == 0xf || $_[0]{type} == 0x85) } sub isRawLVM { $_[0]{type} == 0x8e } @@ -248,7 +250,7 @@ sub isHiddenMacPart { defined $_[0]{isMap} } sub isThisFs { type2fs($_[1]) eq $_[0] } sub isTrueFS { member(type2fs($_[0]), qw(ext2 reiserfs xfs jfs ext3)) } -sub isOtherAvailableFS { isFat($_[0]) || isSunOS($_[0]) || isThisFs('hfs', $_[0]) || isThisFs('ntfs', $_[0]) } #- other OS that linux can access its filesystem +sub isOtherAvailableFS { isEfi($_[0]) || isFat($_[0]) || isSunOS($_[0]) || isThisFs('hfs', $_[0]) || isThisFs('ntfs', $_[0]) } #- other OS that linux can access its filesystem sub isMountableRW { (isTrueFS($_[0]) || isOtherAvailableFS($_[0])) && !isThisFs('ntfs', $_[0]) } sub isNonMountable { isRawRAID($_[0]) || isRawLVM($_[0]) } |