From 564cabf99198bc8a564eb58bc6c674a2b8f21927 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 27 Mar 2001 13:11:28 +0000
Subject: remove use of Bastille. get back to the good state we had :)

---
 perl-install/any.pm      | 14 --------------
 perl-install/install2.pm |  3 +--
 2 files changed, 1 insertion(+), 16 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/any.pm b/perl-install/any.pm
index 7df987faf..9f861bf00 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -796,18 +796,4 @@ sub runlevel {
     }
 }
 
-sub set_security_level {
-    my ($prefix, $security) = @_;
-
-    my %bastille_levels = (
-	2 => "Lax",
-	3 => "Moderate",
-	4 => "Paranoia",
-    );
-    eval {
-	commands::cp("-f", "$prefix/usr/share/Bastille/Workstation" . $bastille_levels{$security} . ".config", "$prefix/etc/Bastille/config");
-	run_program::rooted($prefix, "/usr/sbin/BastilleBackEnd");
-    }
-}
-
 1;
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 66894980c..aa2f2b973 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -313,8 +313,7 @@ sub setupBootloader {
     $o->setupBootloader($_[1] - 1);
     
     local $ENV{DRAKX_PASSWORD} = $o->{bootloader}{password};
-    
-    any::set_security_level($o->{prefix}, $o->{security});
+    run_program::rooted($o->{prefix}, "/usr/sbin/msec", $o->{security});
 }
 #------------------------------------------------------------------------------
 sub configureX {
-- 
cgit v1.2.1