diff options
| -rw-r--r-- | perl-install/install2.pm | 7 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index daae846a8..6e1b3c288 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -282,12 +282,7 @@ sub setupBootloader { installStepsCall($o, $auto, 'setupBootloaderBefore') if $ent_number == 1; installStepsCall($o, $auto, 'setupBootloader'); - local $ENV{DRAKX_PASSWORD} = $o->{bootloader}{password}; - local $ENV{DURING_INSTALL} = 1; - run_program::rooted($o->{prefix}, "/usr/sbin/msec", "-o", "run_commands=0", "-o", "log=stderr", $o->{security}); - require security::various; - security::various::config_libsafe($o->{prefix}, $o->{libsafe}); - security::various::config_security_user($o->{prefix}, $o->{security_user}); + install_any::set_security($o); } #------------------------------------------------------------------------------ sub configureX { diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index e6552307f..57ac266ed 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -1078,6 +1078,18 @@ sub disable_user_view { substInFile { s/^Browser=.*/Browser=0/ } "$prefix/etc/X11/gdm/gdm.conf"; } +sub set_security { + my ($o) = @_; + { + local $ENV{DRAKX_PASSWORD} = $o->{bootloader}{password}; + local $ENV{DURING_INSTALL} = 1; + security::level::set($o->{security}); + } + require security::various; + security::various::config_libsafe($::prefix, $o->{libsafe}); + security::various::config_security_user($::prefix, $o->{security_user}); +} + sub write_fstab { my ($o) = @_; fs::write_fstab($o->{all_hds}, $o->{prefix}) if !$::live && !$o->{isUpgrade}; |