diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2000-01-27 22:15:55 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2000-01-27 22:15:55 +0000 |
commit | f5b6d853f3ed37cd88f4797f7bfb41fef7dd81ce (patch) | |
tree | 0e4db5f684c4e5dac4779c78a2ca90cf63aa5079 /perl-install/fsedit.pm | |
parent | de9cfda6393333a5a9e69e666aa6f56b8971c16c (diff) | |
download | drakx-backup-do-not-use-f5b6d853f3ed37cd88f4797f7bfb41fef7dd81ce.tar drakx-backup-do-not-use-f5b6d853f3ed37cd88f4797f7bfb41fef7dd81ce.tar.gz drakx-backup-do-not-use-f5b6d853f3ed37cd88f4797f7bfb41fef7dd81ce.tar.bz2 drakx-backup-do-not-use-f5b6d853f3ed37cd88f4797f7bfb41fef7dd81ce.tar.xz drakx-backup-do-not-use-f5b6d853f3ed37cd88f4797f7bfb41fef7dd81ce.zip |
no_comment
Diffstat (limited to 'perl-install/fsedit.pm')
-rw-r--r-- | perl-install/fsedit.pm | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index 95b5006df..866993793 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -20,7 +20,9 @@ use log; #- Globals #-##################################################################################### my @suggestions = ( +arch() =~ /^i386/ ? ( { mntpoint => "/boot", size => 16 << 11, type => 0x83, maxsize => 30 << 11 }, +) : (), { mntpoint => "/", size => 50 << 11, type => 0x83, ratio => 1, maxsize => 300 << 11 }, { mntpoint => "swap", size => 30 << 11, type => 0x82, ratio => 1, maxsize => 250 << 11 }, { mntpoint => "/usr", size => 200 << 11, type => 0x83, ratio => 6, maxsize =>1500 << 11 }, @@ -171,9 +173,11 @@ sub suggest_part($$$;$) { grep { !$part->{type} || $part->{type} == $_->{type} } @$suggestions or return; - $best = $second if - $best->{mntpoint} eq '/boot' && - $part->{start} + $best->{size} > 1024 * $hd->cylinder_size(); #- if the empty slot is beyond the 1024th cylinder, no use having /boot + if (arch() =~ /^i386/) { + $best = $second if + $best->{mntpoint} eq '/boot' && + $part->{start} + $best->{size} > 1024 * $hd->cylinder_size(); #- if the empty slot is beyond the 1024th cylinder, no use having /boot + } defined $best or return; #- sorry no suggestion :( @@ -227,7 +231,7 @@ sub check_mntpoint { has_mntpoint($mntpoint, $hds) and die _("There is already a partition with mount point %s", $mntpoint); - if ($part->{start} + $part->{size} > 1024 * $hd->cylinder_size()) { + if ($part->{start} + $part->{size} > 1024 * $hd->cylinder_size() && arch() =~ /i386/) { die "/boot ending on cylinder > 1024" if $mntpoint eq "/boot"; die "/ ending on cylinder > 1024" if $mntpoint eq "/" && !has_mntpoint("/boot", $hds); } |