diff options
| -rw-r--r-- | perl-install/any.pm | 14 | ||||
| -rw-r--r-- | perl-install/install2.pm | 3 | ||||
| -rw-r--r-- | perl-install/share/rpmsrate | 6 |
3 files changed, 19 insertions, 4 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 2494bd8c0..260983fa8 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -792,4 +792,18 @@ 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 1ac378c4d..05ef24962 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -313,7 +313,8 @@ sub setupBootloader { $o->setupBootloader($_[1] - 1); local $ENV{DRAKX_PASSWORD} = $o->{bootloader}{password}; - run_program::rooted($o->{prefix}, "/usr/sbin/msec", $o->{security}); + + any::set_security_level($o->{prefix}, $o->{security}); } #------------------------------------------------------------------------------ sub configureX { diff --git a/perl-install/share/rpmsrate b/perl-install/share/rpmsrate index aca08b66f..8f135d920 100644 --- a/perl-install/share/rpmsrate +++ b/perl-install/share/rpmsrate @@ -383,7 +383,7 @@ FILE_TOOLS CONFIG 5 drakxtools ldetect 3 ipchains iptables ipvsadm linuxconf - quota shapecfg timetool userdrake usernet Bastille-Curses-module + quota shapecfg timetool userdrake usernet 2 control-panel adjtimex isicom xinput timeconfig Bastille-Tk-module 1 ipxutils 4 GNOME gnome-linuxconf @@ -394,10 +394,10 @@ SYSTEM 5 DrakConf MAKEDEV XFree86 XFree86-75dpi-fonts at anacron eject gurpmi harddrake kudzu linux_logo locales man-pages iputils - rpmdrake urpmi + rpmdrake urpmi Bastille-Curses-module 4 fonts-ttf-decoratives fonts-ttf-west_european menudrake sndconfig ftp gpm - hexedit strace rxvt drakfloppy drakfont + hexedit strace rxvt drakfloppy drakfont Bastille 4 LOCALES"ja" || LOCALES"ko" || LOCALES"zh" || LOCALES"zh_CN" || LOCALES"zh_CN.GB2312" || LOCALES"zh_TW" || LOCALES"zh_TW.Big5" rxvt-CJK 3 XFree86-100dpi-fonts autofs drakprofile bc 2 kernel-utils sane acpid tksysv imlib-cfgeditor adns audiofile awesfx fbset gfcc sudo |