summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2010-02-09 19:29:35 +0000
committerPascal Terjan <pterjan@mandriva.org>2010-02-09 19:29:35 +0000
commit7c34e66129d9a6b83d89f4614ffe34f552590afc (patch)
treed3dd0c771055cfb6382fdc9523a50a2ce1ef3099
parenta91bcf5a79edb4a653f3114d55f508eb00615cb2 (diff)
downloaddrakx-backup-do-not-use-7c34e66129d9a6b83d89f4614ffe34f552590afc.tar
drakx-backup-do-not-use-7c34e66129d9a6b83d89f4614ffe34f552590afc.tar.gz
drakx-backup-do-not-use-7c34e66129d9a6b83d89f4614ffe34f552590afc.tar.bz2
drakx-backup-do-not-use-7c34e66129d9a6b83d89f4614ffe34f552590afc.tar.xz
drakx-backup-do-not-use-7c34e66129d9a6b83d89f4614ffe34f552590afc.zip
fix using unpartitionned dmraid
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/partition_table/raw.pm14
2 files changed, 14 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index da57eca01..590260a87 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -13,6 +13,7 @@ Version 12.77.5 - 09 February 2010
o suggest non-removable disks first
o unmount swap too when unmounting all partitions
o fix a crash on empty disks
+ o fix using unpartitionned dmraid
Version 12.77 - 30 October 2009
diff --git a/perl-install/partition_table/raw.pm b/perl-install/partition_table/raw.pm
index 1346eeac4..edae9bb65 100644
--- a/perl-install/partition_table/raw.pm
+++ b/perl-install/partition_table/raw.pm
@@ -124,7 +124,19 @@ sub get_geometries {
my (@hds) = @_;
@hds = grep {
- if (my $h = get_geometry($_->{file})) {
+ if ($_->{bus} =~ /dmraid/) {
+ sysopen(my $F, $_->{file}, 0);
+ my $total = c::total_sectors(fileno $F);
+ my %geom;
+ $geom{heads} = 255;
+ $geom{sectors} = 63;
+ $geom{start} = 1;
+ compute_nb_cylinders(\%geom, $total);
+ $geom{totalcylinders} = $geom{cylinders};
+ log::l("Fake geometry on ".$_->{file}.": heads=$geom{heads} sectors=$geom{sectors} cylinders=$geom{cylinders} start=$geom{start}");
+ add2hash_($_, { totalsectors => $total, geom => \%geom });
+ 1;
+ } elsif (my $h = get_geometry($_->{file})) {
add2hash_($_, $h);
1;
} else {