diff options
| -rw-r--r-- | perl-install/any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install2.pm | 1 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 2 |
5 files changed, 6 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 34b8464ac..d1994d2c9 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -1100,7 +1100,7 @@ connections from many clients. Note: if your machine is only a client on the Int if_($in->do_pkgs->is_installed('libsafe') && arch() =~ /^i.86/, { label => _("Use libsafe for servers"), val => $libsafe, type => 'bool', text => _("A library which defends against buffer overflow and format string attacks.") } ), - { label => _("Security Administrator (login or email)"), val => \$email, }, + { label => _("Security Administrator (login or email)"), val => $email, }, ], ); } diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 6fbc15ff5..90ac0894a 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -294,6 +294,7 @@ sub setupBootloader { local $ENV{DURING_INSTALL} = 1; run_program::rooted($o->{prefix}, "/usr/sbin/msec", "-o", "run_commands=0", "-o", "log=stderr", $o->{security}); any::config_libsafe($o->{prefix}, $o->{libsafe}); + any::config_security_user($o->{prefix}, $o->{security_user}); } #------------------------------------------------------------------------------ sub configureX { diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index c64358e3b..72e321b63 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -724,7 +724,7 @@ sub g_auto_install { my @fields = qw(mntpoint type size); $o->{partitions} = [ map { my %l; @l{@fields} = @$_{@fields}; \%l } grep { $_->{mntpoint} } @{$::o->{fstab}} ]; - exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(lang authentication mouse netc timezone superuser intf keyboard users partitioning isUpgrade manualFstab nomouseprobe crypto security netcnx useSupermount autoExitInstall mkbootdisk X services); #- TODO modules bootloader + exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(lang authentication mouse netc timezone superuser intf keyboard users partitioning isUpgrade manualFstab nomouseprobe crypto security security_user libsafe netcnx useSupermount autoExitInstall mkbootdisk X services); #- TODO modules bootloader if (my $printer = $::o->{printer}) { $o->{printer}{$_} = $::o->{printer}{$_} foreach qw(SPOOLER DEFAULT BROWSEPOLLADDR BROWSEPOLLPORT MANUALCUPSCONFIG); diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 4439473f4..4ae4c9848 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -945,6 +945,8 @@ sub miscellaneousBefore { my %s = getVarsFromSh("$o->{prefix}/etc/sysconfig/system"); $o->{miscellaneous}{HDPARM} = $s{HDPARM} if exists $s{HDPARM}; $o->{security} ||= any::get_secure_level() || ($o->{meta_class} =~ /server|firewall/ ? 3 : 2); + $o->{security_user} ||= any::config_security_user($o->{prefix}); + $o->{libsafe} ||= any::config_libsafe($o->{prefix}); log::l("security $o->{security}"); diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 3682899fa..68efd61f3 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -1263,7 +1263,7 @@ sub miscellaneous { my ($o, $clicked) = @_; if ($::expert) { - any::choose_security_level($o, \$o->{security}, \$o->{libsafe}) or return; + any::choose_security_level($o, \$o->{security}, \$o->{libsafe}, \$o->{security_user}) or return; } install_steps::miscellaneous($o); } |