summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-19 14:50:34 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-19 14:50:34 +0000
commita9042d2def58b5262e307f227432c27c45ff1d68 (patch)
treebfcde2f12a8a4603281f3e94a5e65e2653d0b72e
parenta4e1b8cab292ea6577823feb600ac83cc1b7f5ea (diff)
downloaddrakx-a9042d2def58b5262e307f227432c27c45ff1d68.tar
drakx-a9042d2def58b5262e307f227432c27c45ff1d68.tar.gz
drakx-a9042d2def58b5262e307f227432c27c45ff1d68.tar.bz2
drakx-a9042d2def58b5262e307f227432c27c45ff1d68.tar.xz
drakx-a9042d2def58b5262e307f227432c27c45ff1d68.zip
- diskdrake:
o "Clear All" defaults to LVM on full disk if drive is >4TB
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/partition_table.pm13
2 files changed, 10 insertions, 5 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a6c0c0cf0..4431b8cd1 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- diskdrake:
+ o "Clear All" defaults to LVM on full disk if drive is >4TB
- restore banner on pop up messages (#33753)
- handle /boot/xxx files on linux raid1
- when basesystem can't be selected, display the reason
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index e249e2a83..5b2d30aaf 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -224,16 +224,19 @@ sub get_normal_parts_and_holes {
}
sub _default_type {
- my $type = arch() =~ /ia64/ ? 'gpt' : arch() eq "alpha" ? "bsd" : arch() =~ /^sparc/ ? "sun" : arch() eq "ppc" ? "mac" : "dos";
- #- override standard mac type on PPC for IBM machines to dos
- $type = "dos" if arch() =~ /ppc/ && detect_devices::get_mac_model() =~ /^IBM/;
- $type;
+ my ($hd) = @_;
+
+ arch() =~ /ia64/ ? 'gpt' :
+ arch() eq "alpha" ? "bsd" :
+ arch() =~ /^sparc/ ? "sun" :
+ arch() eq "ppc" && detect_devices::get_mac_model() !~ /^IBM/ ? "mac" :
+ $hd->{totalsectors} > 4 * 1024 * 1024 * 2048 ? 'lvm' : "dos"; #- default to LVM on full disk when >4TB
}
sub initialize {
my ($hd, $o_type) = @_;
- my $type = $o_type || _default_type();
+ my $type = $o_type || _default_type($hd);
require "partition_table/$type.pm";
"partition_table::$type"->initialize($hd);