From 7d9973538da0ffaf2c95412393f072c330bd2c5e Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Tue, 19 Nov 2002 13:37:21 +0000
Subject: - fix duplication of sec level setting:   merge
 any::get_secure_level() with   secure::msec::get_secure_level() - move
 security level functions from secure::msec   to secure::level - uses
 secure::level in install_steps - fix duplication of security level labels -
 draksec: use same strings in drakx, got nice   translations -
 get_default_checks(): make it more readable

---
 perl-install/install_steps.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'perl-install/install_steps.pm')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 738cb5290..6df6bd0d2 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -950,7 +950,8 @@ sub miscellaneousBefore {
 
     my %s = getVarsFromSh("$o->{prefix}/etc/sysconfig/system");
     $o->{miscellaneous}{HDPARM} = $s{HDPARM} if exists $s{HDPARM};
-    $o->{security} ||= any::get_secure_level() || ($o->{meta_class} =~ /server|firewall/ ? 3 : 2);
+    require security::level;
+    $o->{security} ||= security::level::get() || ($o->{meta_class} =~ /server|firewall/ ? 3 : 2);
     $o->{security_user} ||= any::config_security_user($o->{prefix});
     $o->{libsafe} ||= any::config_libsafe($o->{prefix});
 
-- 
cgit v1.2.1