From 34a5d9236366d112abaaeb2b2ac0bd1738dd3220 Mon Sep 17 00:00:00 2001
From: Stew Benedict <stewb@mandriva.org>
Date: Wed, 13 Jun 2001 13:11:42 +0000
Subject: fix HFS partition mount/format issue, offer /mnt/macos, modem
 detection

---
 perl-install/fs.pm              | 2 ++
 perl-install/fsedit.pm          | 2 +-
 perl-install/partition_table.pm | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index cc42a96a4..60bbafeb0 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -212,6 +212,8 @@ sub mount($$$;$) {
 	    $mount_opt = 'check=relaxed';
 	    eval { modules::load('vfat') }; #- try using vfat
 	    eval { modules::load('msdos') } if $@; #- otherwise msdos...
+	} elsif ($fs eq 'hfs') {
+	    eval { modules::load('hfs') };
 	} elsif ($fs eq 'ufs') {
 	    eval { modules::load('ufs') };
 	} elsif ($fs eq 'xfs') {
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 5a25d55b3..19c0d9888 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -37,7 +37,7 @@ use fs;
 );
 my @suggestions_mntpoints = (
     "/root", "/var/ftp", "/var/www", "/boot",
-    arch() =~ /sparc/ ? "/mnt/sunos" : "/mnt/windows",
+    arch() =~ /sparc/ ? "/mnt/sunos" : arch() =~ /ppc/ ? "/mnt/macos" : "/mnt/windows",
 );
 
 my @partitions_signatures = (
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 05cb5e5f1..69ec7f105 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -228,7 +228,7 @@ sub isWin($) { $ {{ 0xb=>1, 0xc=>1, 0xe=>1, 0x1b=>1, 0x1c=>1, 0x1e=>1 }}{$_[0]{t
 sub isFat($) { isDos($_[0]) || isWin($_[0]) }
 sub isSunOS($) { arch() =~ /sparc/ && $ {{ 0x1=>1, 0x2=>1, 0x4=>1, 0x6=>1, 0x7=>1, 0x8=>1 }}{$_[0]{type}} }
 sub isSolaris($) { 0; } #- hack to search for getting the difference ? TODO
-sub isOtherAvailableFS($) { isFat($_[0]) || isSunOS($_[0]) } #- other OS that linux can access its filesystem
+sub isOtherAvailableFS($) { isFat($_[0]) || isSunOS($_[0]) || isHFS($_[0]) } #- other OS that linux can access its filesystem
 sub isNfs($) { $_[0]{type} eq 'nfs' } #- small hack
 sub isNT($) { arch() !~ /^sparc/ && $_[0]{type} == 0x7 }
 sub isSupermount($) { $_[0]{type} eq 'supermount' }
-- 
cgit v1.2.1