- move any::choose_security_level() to security::level::level_choose()

- move any::config_security_user() to security::various::config_security_user()
- move any::config_libsafe() and security::libsafe::config_libsafe() to security::various::config_libsafe()

1 files changed, 3 insertions, 2 deletions

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 592d119d1..34503a80e 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -931,9 +931,10 @@ sub miscellaneousBefore {
     my %s = getVarsFromSh("$o->{prefix}/etc/sysconfig/system");
     $o->{miscellaneous}{HDPARM} = $s{HDPARM} if exists $s{HDPARM};
     require security::level;
+    require security::various;
     $o->{security} ||= security::level::get() || ($o->{meta_class} =~ /server|firewall/ ? 3 : 2);
-    $o->{security_user} ||= any::config_security_user($o->{prefix});
-    $o->{libsafe} ||= any::config_libsafe($o->{prefix});
+    $o->{security_user} ||= security::various::config_security_user($o->{prefix});
+    $o->{libsafe} ||= security::various::config_libsafe($o->{prefix});
 
     log::l("security $o->{security}");