From e22ce2c6238ae5b238a01e7a443a782409d65126 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 20 Feb 2002 12:37:51 +0000
Subject: factorize and update the reading of previous security level

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

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

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index ced2cd281..41b59882e 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -918,8 +918,8 @@ sub miscellaneousBefore {
     my ($o) = @_;
 
     my %s = getVarsFromSh("$o->{prefix}/etc/sysconfig/system");
-    $o->{miscellaneous}{HDPARM} ||= $s{HDPARM} if exists $s{HDPARM};
-    $o->{security} ||= $s{SECURITY} if exists $s{SECURITY};
+    $o->{miscellaneous}{HDPARM} = $s{HDPARM} if exists $s{HDPARM};
+    $o->{security} = any::get_secure_level($o->{prefix}) || $o->{security};
 
     add2hash_($o->{miscellaneous} ||= {}, { numlock => !detect_devices::isLaptop() });
 }
-- 
cgit v1.2.1