summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni@mandriva.org>2009-02-16 17:13:06 +0000
committerEugeni Dodonov <eugeni@mandriva.org>2009-02-16 17:13:06 +0000
commit89a7896512c618eb8f19610755ab64ff80dd1df6 (patch)
treed5ab074a0369f3d0967a5d8f455f3ce541aee4e6
parent63ddaa1a0732aabc33fb36792b4812b0c6d4f700 (diff)
downloaddrakx-89a7896512c618eb8f19610755ab64ff80dd1df6.tar
drakx-89a7896512c618eb8f19610755ab64ff80dd1df6.tar.gz
drakx-89a7896512c618eb8f19610755ab64ff80dd1df6.tar.bz2
drakx-89a7896512c618eb8f19610755ab64ff80dd1df6.tar.xz
drakx-89a7896512c618eb8f19610755ab64ff80dd1df6.zip
Correctly handle new msec-based settings during installation (#47822).
-rw-r--r--perl-install/install/any.pm2
-rw-r--r--perl-install/install/steps.pm4
-rw-r--r--perl-install/install/steps_interactive.pm2
3 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index a3a59d265..6ad227e20 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -504,7 +504,7 @@ sub rpmsrate_always_flags {
$rpmsrate_flags_chosen->{DVD} = 1 if $o->{match_all_hardware} || detect_devices::dvdroms();
$rpmsrate_flags_chosen->{USB} = 1 if $o->{match_all_hardware} || $o->{modules_conf}->get_probeall("usb-interface");
$rpmsrate_flags_chosen->{PCMCIA} = 1 if $o->{match_all_hardware} || detect_devices::hasPCMCIA();
- $rpmsrate_flags_chosen->{HIGH_SECURITY} = 1 if $o->{security} > 3;
+ $rpmsrate_flags_chosen->{HIGH_SECURITY} = 1 if $o->{security} > 1;
$rpmsrate_flags_chosen->{BIGMEM} = 1 if detect_devices::BIGMEM();
$rpmsrate_flags_chosen->{SMP} = 1 if $o->{match_all_hardware} || detect_devices::hasSMP();
if (!$o->{match_all_hardware} && !defined $o->{compssListLevel} && detect_devices::need_light_desktop()) {
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 24b34c046..6ffb79935 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -505,7 +505,7 @@ EOF
}
- install::any::disable_user_view() if $o->{security} >= 3 || $o->{authentication}{NIS};
+ install::any::disable_user_view() if $o->{security} > 1 || $o->{authentication}{NIS};
run_program::rooted($::prefix, "kdeDesktopCleanup");
#- move some file after an upgrade that may be seriously annoying.
@@ -651,7 +651,7 @@ sub configure_firewall {
my ($o) = @_;
#- set up a firewall if ports have been specified or if the security level is high enough
- $o->{firewall_ports} ||= '' if $o->{security} >= 3 && !exists $o->{firewall_ports};
+ $o->{firewall_ports} ||= '' if $o->{security} >= 1 && !exists $o->{firewall_ports};
if (defined $o->{firewall_ports}) {
require network::drakfirewall;
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index cea3c06e2..5c449edb4 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -1000,7 +1000,7 @@ sub summary {
},
clicked => sub {
require network::drakfirewall;
- if (my @rc = network::drakfirewall::main($o, $o->{security} <= 3)) {
+ if (my @rc = network::drakfirewall::main($o, $o->{security} < 1)) {
$o->{firewall_ports} = !$rc[0] && $rc[1];
}
},