*** empty log message ***

3 files changed, 41 insertions, 26 deletions

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 04a4c7dff..9547d08c3 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -510,6 +510,7 @@ sub main {
 	    eval { $o->errorInStep($_) } unless /^already displayed/;
 	    $@ and next;
 	    $o->{step} = $o->{steps}{$o->{step}}{onError};
+	    next MAIN unless $o->{steps}{$o->{step}}{reachable}; #- sanity check: avoid a step not reachable on error.
 	    redo MAIN;
 	}
 	$o->{steps}{$o->{step}}{done} = 1;
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index a4bf25532..16835a196 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -49,9 +49,9 @@ sub leavingStep($$) {
     eval { commands::cp('-f', "/tmp/ddebug.log", "$o->{prefix}/root") } if -d "$o->{prefix}/root" && !$::testing;
 
     for (my $s = $o->{steps}{first}; $s; $s = $o->{steps}{$s}{next}) {
-
+	#- the reachability property must be recomputed each time to take
+	#- into account failed step.
 	next if $o->{steps}{$s}{done} && !$o->{steps}{$s}{redoable};
-	next if $o->{steps}{$s}{reachable};
 
 	my $reachable = 1;
 	if (my $needs = $o->{steps}{$s}{needs}) {
@@ -340,9 +340,11 @@ sub readBootloaderConfigBeforeInstall {
 	    $v = readlink "$o->{prefix}/boot/$image";
 	    if ($v) {
 		$v = "/boot/$v" if $v !~ m@/@;
-		$o->{bootloader}{entries}{$v} = $o->{bootloader}{entries}{"/boot/$image"};
-		delete $o->{bootloader}{entries}{"/boot/$image"};
-		log::l("renaming /boot/$image entry by $v");
+		if (-e "$o->{prefix}$v") {
+		    $o->{bootloader}{entries}{$v} = $o->{bootloader}{entries}{"/boot/$image"};
+		    delete $o->{bootloader}{entries}{"/boot/$image"};
+		    log::l("renaming /boot/$image entry by $v");
+		}
 	    }
 	}
     }
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 0af1c3d8b..ffa6d9ff4 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -31,44 +31,56 @@ my %keyboards = (
 #- "am" => [ __("Armenian"),       "am-armscii8",  "am" ],
  "be" => [ __("Belgian"),        "be-latin1",   "be" ],
  "bg" => [ __("Bulgarian"),      "bg",          "bg" ],
- "cz" => [ __("Czech"),          "cz-latin2",   "czsk" ],
+#- TO CHECK CHANGED AS NEXT ONE "cz" => [ __("Czech"),          "cz-latin2",   "czsk" ],
+ "cz" => [ __("Czech"),          "cz-lat2",     "czsk" ],
  "de" => [ __("German"),         "de-latin1",   "de" ],
  "dk" => [ __("Danish"),         "dk-latin1",   "dk" ],
-"dvorak" => [ __("Dvorak"),      "dvorak",      "dvorak" ],
- "ee" => [ __("Estonian"),       "ee-latin9",   "ee" ],
- "es" => [ __("Spanish"),        "es-latin1",   "es" ],
+ "dvorak" => [ __("Dvorak"),     "dvorak",      "dvorak" ],
+#- TO CHECK "ee" => [ __("Estonian"),       "ee-latin9",   "ee" ],
+#- TO CHECK CHANGED AS NEXT ONE "es" => [ __("Spanish"),        "es-latin1",   "es" ],
+ "es" => [ __("Spanish"),        "es",          "es" ],
  "fi" => [ __("Finnish"),        "fi-latin1",   "fi" ],
  "fr" => [ __("French"),         "fr-latin1",   "fr" ],
 #- georgian keyboards have to be written...
 #-"ge_ru"=>[__("Georgian (\"Russian\" layout)","ge_ru-georgian_academy","ge_ru"],
 #-"ge_la"=>[__("Georgian ("\Latin\" layout)","ge_la-georgian_academy","ge_la"],
- "gr" => [ __("Greek"),          "gr-8859_7",   "gr" ],
- "hu" => [ __("Hungarian"),      "hu-latin2",   "hu" ],
- "il" => [ __("Israeli"),      "il-8859_8",   "il" ],
+#- TO CHECK CHANGED AS NEXT ONE "gr" => [ __("Greek"),          "gr-8859_7",   "gr" ],
+ "gr" => [ __("Greek"),          "gr",          "gr" ],
+#- TO CHECK CHANGED AS NEXT ONE "hu" => [ __("Hungarian"),      "hu-latin2",   "hu" ],
+ "hu" => [ __("Hungarian"),      "hu",          "hu" ],
+#- TO CHECK CHANGED AS NEXT ONE "il" => [ __("Israeli"),        "il-8859_8",   "il" ],
+ "il" => [ __("Israeli"),        "hebrew",      "il" ],
  "is" => [ __("Icelandic"),      "is-latin1",   "is" ],
- "it" => [ __("Italian"),        "it-latin1",   "it" ],
+#- TO CHECK CHANGED AS NEXT ONE "it" => [ __("Italian"),        "it-latin1",   "it" ],
+ "it" => [ __("Italian"),        "it",   "it" ],
  "la" => [ __("Latin American"), "la-latin1",   "la" ],
- "nl" => [ __("Dutch"),          "nl-latin1",   "nl" ],
- "lt" => [ __("Lithuanian AZERTY"), "lta-latin7", "lt" ],
- "lt_b" => [ __("Lithuanian \"number row\" QWERTY"), "ltb-latin7", "lt_b" ],
- "lt_p" => [ __("Lithuanian \"phonetic\" QWERTY"), "ltp-latin7", "lt_p" ],
+#- TO CHECK CHANGED AS NEXT ONE "nl" => [ __("Dutch"),          "nl-latin1",   "nl" ],
+ "nl" => [ __("Dutch"),          "nl",          "nl" ],
+#- TO CHECK "lt" => [ __("Lithuanian AZERTY"), "lta-latin7", "lt" ],
+#- TO CHECK "lt_b" => [ __("Lithuanian \"number row\" QWERTY"), "ltb-latin7", "lt_b" ],
+#- TO CHECK "lt_p" => [ __("Lithuanian \"phonetic\" QWERTY"), "ltp-latin7", "lt_p" ],
  "no" => [ __("Norwegian"),      "no-latin1",   "no" ],
- "pl" => [ __("Polish"),         "pl-latin2",   "pl" ],
+#- TO CHECK CHANGED AS NEXT ONE "pl" => [ __("Polish"),         "pl-latin2",   "pl" ],
+ "pl" => [ __("Polish"),         "pl",   "pl" ],
  "pt" => [ __("Portuguese"),     "pt-latin1",   "pt" ],
- "qc" => [ __("Canadian (Quebec)"), "qc-latin1","ca_enhanced" ],
- "ru" => [ __("Russian"),        "ru-koi8",     "ru" ],
+#- TO CHECK "qc" => [ __("Canadian (Quebec)"), "qc-latin1","ca_enhanced" ],
+#- TO CHECK CHANGED AS NEXT ONE "ru" => [ __("Russian"),        "ru-koi8",     "ru" ],
+ "ru" => [ __("Russian"),        "ru",          "ru" ],
  "se" => [ __("Swedish"),        "se-latin1",   "se_SE" ],
- "sf" => [ __("Swiss (French layout)"), "sf-latin1", "fr_CH" ],
+#- TO CHECK CHANGED AS NEXT ONE "sf" => [ __("Swiss (French layout)"), "sf-latin1", "fr_CH" ],
+ "sf" => [ __("Swiss (French layout)"), "fr_CH-latin1", "fr_CH" ],
  "sg" => [ __("Swiss (German layout)"), "sg-latin1", "de_CH" ],
- "si" => [ __("Slovenian"),      "si-latin1",   "si" ],
- "sk" => [ __("Slovakian"),      "sk-latin2",   "czsk" ],
+#- TO CHECK "si" => [ __("Slovenian"),      "si-latin1",   "si" ],
+#- TO CHECK "sk" => [ __("Slovakian"),      "sk-latin2",   "czsk" ],
 #- the xmodmap.th has to be fixed to use tis620 keymaps
 #- "th" => [ __("Thai keyboard"),  "th",          "th" ],
  "tr_f"  => [ __("Turkish (traditional \"F\" model)"), "tr_f-latin5", "tr_f" ],
  "tr_q" => [ __("Turkish (modern \"Q\" model)"), "tr_q-latin5", "tr_q" ],
- "uk" => [ __("UK keyboard"),    "uk-latin1",   "gb" ],
- "us" => [ __("US keyboard"),    "us-latin",    "us_intl" ],
- "yu" => [ __("Yugoslavian (latin layout)"), "yu-latin2", "yu" ],
+#- TO CHECK CHANGED AS NEXT ONE "uk" => [ __("UK keyboard"),    "uk-latin1",           "gb" ],
+ "uk" => [ __("UK keyboard"),    "uk",           "gb" ],
+#- TO CHECK CHANGED AS NEXT ONE "us" => [ __("US keyboard"),    "us-latin",           "us_intl" ],
+ "us" => [ __("US keyboard"),    "us",           "us_intl" ],
+#- TO CHECK "yu" => [ __("Yugoslavian (latin layout)"), "yu-latin2", "yu" ],
 );
 
 #-######################################################################################