diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-03-27 13:11:28 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-03-27 13:11:28 +0000 |
| commit | 564cabf99198bc8a564eb58bc6c674a2b8f21927 (patch) | |
| tree | 5f4728d204707db670c50664693d892ffaa98e54 | |
| parent | a8f38a27c69f57300a3f6dbd9e865f5d1214a835 (diff) | |
| download | drakx-564cabf99198bc8a564eb58bc6c674a2b8f21927.tar drakx-564cabf99198bc8a564eb58bc6c674a2b8f21927.tar.gz drakx-564cabf99198bc8a564eb58bc6c674a2b8f21927.tar.bz2 drakx-564cabf99198bc8a564eb58bc6c674a2b8f21927.tar.xz drakx-564cabf99198bc8a564eb58bc6c674a2b8f21927.zip | |
remove use of Bastille. get back to the good state we had :)
| -rw-r--r-- | perl-install/any.pm | 14 | ||||
| -rw-r--r-- | perl-install/install2.pm | 3 |
2 files changed, 1 insertions, 16 deletions
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 { |