From f81b32e31ed390741885751da287a35409d6efb5 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 16 Aug 2000 15:44:10 +0000
Subject: no_comment

---
 Makefile                 | 3 ++-
 perl-install/install2.pm | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 726a4dcaa..67a2b4e81 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,8 @@ clean:
 upload: clean install
 	function upload() { rsync -qSavz --verbose --exclude '*~' -e ssh --delete $(ROOTDEST)/$$1/$$2 mandrake@kenobi:/c/cooker/$$1; } ;\
 	upload Mandrake/mdkinst '' ;\
-	upload Mandrake/base {compss*,mdkinst_stage2.gz,rescue_stage2.gz} ;\
+	upload Mandrake/base compss* ;\
+	upload Mandrake/base *_stage2.gz ;\
 	upload boot '' ;\
 	for i in $(RELEASE_BOOT_IMG); do upload images $$i; done ;\
 	echo 
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 853c62635..737a0b2db 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -235,7 +235,7 @@ sub selectLanguage {
 
     addToBeDone {
 	lang::write($o->{prefix});
-	keyboard::write($o->{prefix}, lang::lang2charset($o->{lang}), $o->{keyboard});
+	keyboard::write($o->{prefix}, $o->{keyboard}, lang::lang2charset($o->{lang}));
     } 'installPackages' unless $::g_auto_install;
 }
 
@@ -269,7 +269,7 @@ sub selectKeyboard {
     #- if we go back to the selectKeyboard, you must rewrite
     addToBeDone {
 	lang::write($o->{prefix});
-	keyboard::write($o->{prefix}, lang::lang2charset($o->{lang}), $o->{keyboard});
+	keyboard::write($o->{prefix}, $o->{keyboard}, lang::lang2charset($o->{lang}));
     } 'installPackages' unless $::g_auto_install;
 }
 
-- 
cgit v1.2.1