no_comment

4 files changed, 26 insertions, 24 deletions

diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 1cde1f847..67df5da48 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -139,7 +139,7 @@ sub add($$$;$) {
       ($part->{mntpoint} = 'swap') :
       $options->{force} || check_mntpoint($part->{mntpoint}, $hd, $part, $hds);
 
-    partition_table::add($hd, $part, $options->{want_primary});
+    partition_table::add($hd, $part, $options->{primaryOrExtended});
 }
 
 sub removeFromList($$$) {
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 7888b120f..f6cf56986 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -1,4 +1,4 @@
-package lang;
+ package lang;
 
 use diagnostics;
 use strict;
@@ -13,25 +13,25 @@ use log;
 # languages, carefully choosen)
 my @fields =
 my %languages = (
-  "en"  => [ "English",			undef,	      "en", "en_US" ],
-"fr_FR" => [ "French (France)",		"iso-8859-1", "fr", "fr_FR" ],
-"de_DE" => [ "German (Germany)",	"iso-8859-1", "de", "de_DE" ],
-  "hu"  => [ "Hungarian", 		"iso-8859-2", "hu", "hu" ],
-  "is"  => [ "Icelandic", 		"iso-8859-1", "is", "is" ],
-  "id"  => [ "Indonesian",		"iso-8859-1", "id", "id" ],
-  "it"  => [ "Italian",   		"iso-8859-1", "it", "it_IT" ],
-  "ja"  => [ "Japanese",		"jisx0208",   "ja", "ja_JP.ujis" ],
-  "no"  => [ "Norwegian (Bokmaal)",	"iso-8859-1", "no", "no:no\@nynorsk" ],
-"no\@nynorsk" => [ "Norwegian (Nynorsk)","iso-8859-1","no", "no\@nynorsk" ],
-"pt_BR" => [ "Portuguese (Brazil)",	"iso-8859-1", "pt", "pt_BR:pt_PT" ],
-"pt_PT" => [ "Portuguese (Portugal)",	"iso-8859-1", "pt", "pt_PT:pt_BR" ],
-  "ro"  => [ "Romanian",  		"iso-8859-2", "ro", "ro" ],
-  "ru"  => [ "Russian",   		"koi8-r",     "ru", "ru" ],
-  "sk"  => [ "Slovak",    		"iso-8859-2", "sk", "sk" ],
-"es_ES" => [ "Spanish (Spain)",		"iso-8859-1", "es", "es" ],
-  "tr"  => [ "Turkish",	 		"iso-8859-9", "tr", "tr" ],
-  "uk"  => [ "Ukrainian", 		"koi8-u",     "uk", "uk" ],
-  "wa"  => [ "Walon",     		"iso-8859-1", "wa", "wa:fr_BE" ],
+  'en'  => [ 'English',			undef,	      'en', 'en_US' ],
+'fr_FR' => [ 'French (France)',		'iso-8859-1', 'fr', 'fr_FR' ],
+'de_DE' => [ 'German (Germany)',	'iso-8859-1', 'de', 'de_DE' ],
+  'hu'  => [ 'Hungarian', 		'iso-8859-2', 'hu', 'hu' ],
+  'is'  => [ 'Icelandic', 		'iso-8859-1', 'is', 'is' ],
+  'id'  => [ 'Indonesian',		'iso-8859-1', 'id', 'id' ],
+  'it'  => [ 'Italian',   		'iso-8859-1', 'it', 'it_IT' ],
+  'ja'  => [ 'Japanese',		'jisx0208',   'ja', 'ja_JP.ujis' ],
+  'no'  => [ 'Norwegian (Bokmaal)',	'iso-8859-1', 'no', 'no:no@nynorsk' ],
+'no@nynorsk' => [ 'Norwegian (Nynorsk)','iso-8859-1','no', 'no@nynorsk' ],
+'pt_BR' => [ 'Portuguese (Brazil)',	'iso-8859-1', 'pt', 'pt_BR:pt_PT' ],
+'pt_PT' => [ 'Portuguese (Portugal)',	'iso-8859-1', 'pt', 'pt_PT:pt_BR' ],
+  'ro'  => [ 'Romanian',  		'iso-8859-2', 'ro', 'ro' ],
+  'ru'  => [ 'Russian',   		'koi8-r',     'ru', 'ru' ],
+  'sk'  => [ 'Slovak',    		'iso-8859-2', 'sk', 'sk' ],
+'es_ES' => [ 'Spanish (Spain)',		'iso-8859-1', 'es', 'es' ],
+  'tr'  => [ 'Turkish',	 		'iso-8859-9', 'tr', 'tr' ],
+  'uk'  => [ 'Ukrainian', 		'koi8-u',     'uk', 'uk' ],
+  'wa'  => [ 'Walon',     		'iso-8859-1', 'wa', 'wa:fr_BE' ],
 );
 
 my %charsets = (
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 5d7cbd890..2f86e969a 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -401,7 +401,7 @@ The only solution is to move your primary partitions to have the hole next to th
 }
 
 sub add($$;$) {
-    my ($hd, $part, $want_primary) = @_;
+    my ($hd, $part, $primaryOrExtended) = @_;
 
     $part->{notFormatted} = 1;
     $part->{isFormatted} = 0;
@@ -412,7 +412,8 @@ sub add($$;$) {
 
     my $e = $hd->{primary}{extended};
 
-    if (is_empty_array_ref($hd->{primary}{normal}) || $want_primary) {
+    if ($primaryOrExtended eq 'Primary' || 
+	$primaryOrExtended ne 'Extended' && is_empty_array_ref($hd->{primary}{normal})) {
 	eval { add_primary($hd, $part) };
 	return unless $@;
     }
diff --git a/perl-install/share/themes-savane.rc b/perl-install/share/themes-savane.rc
index dcc60633a..717adf259 100644
--- a/perl-install/share/themes-savane.rc
+++ b/perl-install/share/themes-savane.rc
@@ -1,6 +1,7 @@
 style "any"
 {
-  font = "-adobe-helvetica-medium-r-normal-*-*-100-*-*-p-*-iso8859-1"
+  font = "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1,*-helvetica-medium-r-normal--14-*-*-*-*-koi8-r"
+#"-adobe-helvetica-medium-r-normal-*-*-100-*-*-p-*-iso8859-1"
 
   bg[NORMAL]      = { 0.67, 0.33, 0 }
   bg[ACTIVE]      = { 1.0, 0.67, 0 }