From 3bb76495d4f43920bdc8077a028a83b785aa830e Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Wed, 12 Nov 2003 12:14:57 +0000 Subject: need to handle i18n clp before accepting license --- move/move.pm | 9 +++++++-- 1 file 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; -- cgit v1.2.1