summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStew Benedict <stewb@mandriva.org>2001-06-13 13:11:42 +0000
committerStew Benedict <stewb@mandriva.org>2001-06-13 13:11:42 +0000
commit34a5d9236366d112abaaeb2b2ac0bd1738dd3220 (patch)
treef5e73c75eae54f3b375d1ded03f10d6de7a67ab2
parentaf925bb47f73e716618cc063c56b4cfc4b04e6b4 (diff)
downloaddrakx-34a5d9236366d112abaaeb2b2ac0bd1738dd3220.tar
drakx-34a5d9236366d112abaaeb2b2ac0bd1738dd3220.tar.gz
drakx-34a5d9236366d112abaaeb2b2ac0bd1738dd3220.tar.bz2
drakx-34a5d9236366d112abaaeb2b2ac0bd1738dd3220.tar.xz
drakx-34a5d9236366d112abaaeb2b2ac0bd1738dd3220.zip
fix HFS partition mount/format issue, offer /mnt/macos, modem detection
-rw-r--r--perl-install/fs.pm2
-rw-r--r--perl-install/fsedit.pm2
-rw-r--r--perl-install/partition_table.pm2
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' }