summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-11-12 12:14:57 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-11-12 12:14:57 +0000
commit3bb76495d4f43920bdc8077a028a83b785aa830e (patch)
tree6f12e397da3d86528707764f7f42eb9312926443
parente167f343b16ffd151efa07c54e4f8462a6a12eef (diff)
downloaddrakx-3bb76495d4f43920bdc8077a028a83b785aa830e.tar
drakx-3bb76495d4f43920bdc8077a028a83b785aa830e.tar.gz
drakx-3bb76495d4f43920bdc8077a028a83b785aa830e.tar.bz2
drakx-3bb76495d4f43920bdc8077a028a83b785aa830e.tar.xz
drakx-3bb76495d4f43920bdc8077a028a83b785aa830e.zip
need to handle i18n clp before accepting license
-rw-r--r--move/move.pm9
1 files changed, 7 insertions, 2 deletions
diff --git a/move/move.pm b/move/move.pm
index 0b1611366..988def1ae 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -95,9 +95,10 @@ sub init {
drakx_stuff:
$o->{steps}{startMove} = { reachable => 1, text => "Start Move" };
+ $o->{steps}{handleI18NClp} = { reachable => 1, text => "Handle I18N CLP" };
$o->{steps}{handleMoveKey} = { reachable => 1, text => "Handle Move Key" };
$o->{orderedSteps_orig} = $o->{orderedSteps};
- $o->{orderedSteps} = [ qw(selectLanguage acceptLicense handleMoveKey selectMouse selectKeyboard startMove) ];
+ $o->{orderedSteps} = [ qw(selectLanguage handleI18NClp acceptLicense handleMoveKey selectMouse selectKeyboard startMove) ];
member($_, @ALLOWED_LANGS) or delete $lang::langs{$_} foreach keys %lang::langs;
}
@@ -121,10 +122,14 @@ sub lomount_clp {
run_program::run('mount', '-r', $dev, $dir);
}
-sub install2::handleMoveKey {
+sub install2::handleI18NClp {
my $o = $::o;
lomount_clp("always_i18n_$o->{locale}{lang}", '/usr');
+}
+
+sub install2::handleMoveKey {
+ my $o = $::o;
require detect_devices;
require fsedit;