From b4931edea8b30b6eac2347b83661ce5abeddb4a1 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 27 May 2005 05:41:17 +0000
Subject: - since set_security doesn't depend on the bootloader password, we
 can call it where it should - ensure we don't drop entries from
 /etc/sysconfig/system

---
 perl-install/install2.pm      | 2 --
 perl-install/install_steps.pm | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index deae9004b..9ee903de0 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -300,8 +300,6 @@ sub setupBootloader {
 
     installStepsCall($o, $auto, 'setupBootloaderBefore') if $ent_number == 1;
     installStepsCall($o, $auto, 'setupBootloader', $ent_number);
-
-    eval { install_any::set_security($o) };
 }
 #------------------------------------------------------------------------------
 sub configureX {
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 2b42a7237..d64ec5675 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -932,11 +932,13 @@ sub miscellaneousAfter {
     $ENV{SECURE_LEVEL} = $o->{security}; #- deprecated with chkconfig 1.3.4-2mdk, uses /etc/sysconfig/msec
 
     addToBeDone {
-	setVarsInSh("$o->{prefix}/etc/sysconfig/system", { 
+	addVarsInSh("$o->{prefix}/etc/sysconfig/system", { 
 	    META_CLASS => $o->{meta_class} || 'PowerPack',
         });
 	substInFile { s/KEYBOARD_AT_BOOT=.*/KEYBOARD_AT_BOOT=yes/ } "$o->{prefix}/etc/sysconfig/usb" if detect_devices::usbKeyboards();
 
+	eval { install_any::set_security($o) };
+
     } 'installPackages';
 }
 
-- 
cgit v1.2.1