summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-08-16 15:44:10 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-08-16 15:44:10 +0000
commitf81b32e31ed390741885751da287a35409d6efb5 (patch)
tree0f4109adbd497ec2da408c6267881cef41ce475f
parent49e352ab67343e8c27e04e2713ad050c466fa7d3 (diff)
downloaddrakx-f81b32e31ed390741885751da287a35409d6efb5.tar
drakx-f81b32e31ed390741885751da287a35409d6efb5.tar.gz
drakx-f81b32e31ed390741885751da287a35409d6efb5.tar.bz2
drakx-f81b32e31ed390741885751da287a35409d6efb5.tar.xz
drakx-f81b32e31ed390741885751da287a35409d6efb5.zip
no_comment
-rw-r--r--Makefile3
-rw-r--r--perl-install/install2.pm4
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;
}