diff options
author | Thierry Vignaud <tv@mageia.org> | 2012-09-18 10:39:52 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mageia.org> | 2012-09-18 10:39:52 +0000 |
commit | 0c1d3eef434cb424ea05e483e9d58bb9d1456e50 (patch) | |
tree | 39e877d26e9ba6ae64e68286bd4d813241800be4 | |
parent | fd595b4a25c09427f335f0afc2241569d287c544 (diff) | |
download | drakx-0c1d3eef434cb424ea05e483e9d58bb9d1456e50.tar drakx-0c1d3eef434cb424ea05e483e9d58bb9d1456e50.tar.gz drakx-0c1d3eef434cb424ea05e483e9d58bb9d1456e50.tar.bz2 drakx-0c1d3eef434cb424ea05e483e9d58bb9d1456e50.tar.xz drakx-0c1d3eef434cb424ea05e483e9d58bb9d1456e50.zip |
save the untranslated license early
-rw-r--r-- | perl-install/install/install2.pm | 3 | ||||
-rwxr-xr-x | perl-install/standalone/finish-install | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm index 1019e2809..24d99cb03 100644 --- a/perl-install/install/install2.pm +++ b/perl-install/install/install2.pm @@ -27,6 +27,7 @@ use log; use fs; use fs::any; use fs::mount; +use messages; #-####################################################################################### #-$O @@ -65,7 +66,7 @@ $o = $::o = { #- eth0 => { DEVICE => "eth0", IPADDR => '1.2.3.4', NETMASK => '255.255.255.128' } #- }, }, - + untranslated_license => messages::main_license_raw(), #-step : the current one #-prefix #-mouse diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install index 6dd358bed..fc91491cd 100755 --- a/perl-install/standalone/finish-install +++ b/perl-install/standalone/finish-install @@ -12,6 +12,7 @@ use any; use authentication; use network::network; use security::level; +use messages; my $conf_file = '/etc/sysconfig/finish-install'; my %conf = getVarsFromSh($conf_file); @@ -24,6 +25,8 @@ network::network::read_net_conf($net); $::isWizard = 1; my $in = 'interactive'->vnew('su'); +$in->{untranslated_license} = messages::main_license_raw(); + any::set_wm_hints_if_needed($in); sub get_conf { |