summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-12-13 19:03:34 +0000
committerFrancois Pons <fpons@mandriva.com>1999-12-13 19:03:34 +0000
commit0f4c7b1bab30307ecee99c03506b0bb632e5c51f (patch)
tree82d8cc230d0cc881669cd62cc7d09d0ac880ee11 /perl-install
parent32f7f88b4bda4dc953007da0f8ffe93f56a34e28 (diff)
downloaddrakx-0f4c7b1bab30307ecee99c03506b0bb632e5c51f.tar
drakx-0f4c7b1bab30307ecee99c03506b0bb632e5c51f.tar.gz
drakx-0f4c7b1bab30307ecee99c03506b0bb632e5c51f.tar.bz2
drakx-0f4c7b1bab30307ecee99c03506b0bb632e5c51f.tar.xz
drakx-0f4c7b1bab30307ecee99c03506b0bb632e5c51f.zip
*** empty log message ***
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/lang.pm2
-rw-r--r--perl-install/partition_table.pm8
2 files changed, 8 insertions, 2 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 25f0b1cea..ada998bd8 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -32,7 +32,7 @@ my %languages = (
'el' => [ 'Greek', 'iso-8859-7', 'el', 'el' ],
'es_AR' => [ 'Spanish (Argentina)', 'iso-8859-1', 'es', 'es_AR:es_UY:es:es_ES' ],
'es_ES' => [ 'Spanish (Spain, modern sorting)', 'iso-8859-1', 'es', 'es' ],
-'es@tradicional' => [ 'Spanish (Spain, traditional sorting)''iso-8859-1', 'es', 'es' ],
+'es@tradicional' => [ 'Spanish (Spain, traditional sorting)', 'iso-8859-1', 'es', 'es' ],
'es_MX' => [ 'Spanish (Mexico)', 'iso-8859-1', 'es', 'es_MX:es:es_ES' ],
'et' => [ 'Estonian', 'iso-8859-15','et', 'et' ],
'eu' => [ 'Euskara (Basque)', 'iso-8859-1', 'eu', 'eu:es_ES:fr_FR:es:fr' ],
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 6443c6e35..ee67c5481 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -362,7 +362,13 @@ sub read_extended {
#- in case of extended partitions, the start sector is local to the partition or to the first extended_part!
$pt->{normal}{start} += $pt->{start};
- verifyInside($pt->{normal}, $extended) or die "partition $pt->{normal}{device} is not inside its extended partition";
+ #- the following verification can broke an existing partition table that is
+ #- correctly read by fdisk or cfdisk. maybe the extended partition can be
+ #- recomputed to get correct size.
+ if (!verifyInside($pt->{normal}, $extended)) {
+ $extended->{size} = $pt->{normal}{start} + $pt->{normal}{size};
+ verifyInside($pt->{normal}, $extended) or die "partition $pt->{normal}{device} is not inside its extended partition";
+ }
if ($pt->{extended}) {
$pt->{extended}{start} += $hd->{primary}{extended}{start};