From 4babc6a641ba270985369f3956b69e77e1c4e7c6 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 15 Sep 2008 15:32:06 +0000 Subject: do not bother set now unused $o->{libsafe}) ; drop security::various::config_libsafe() --- perl-install/install/any.pm | 3 +-- perl-install/install/steps.pm | 1 - perl-install/security/various.pm | 11 ----------- 3 files changed, 1 insertion(+), 14 deletions(-) (limited to 'perl-install') diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index 8390aabc7..7b7839889 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -656,7 +656,7 @@ sub g_auto_install { $_->{mntpoint} && fs::format::known_type($_); } @{$::o->{fstab}} ]; - exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(locale authentication mouse net timezone superuser keyboard users partitioning isUpgrade manualFstab nomouseprobe crypto security security_user libsafe autoExitInstall X services postInstall postInstallNonRooted); #- TODO modules bootloader + exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(locale authentication mouse net timezone superuser keyboard users partitioning isUpgrade manualFstab nomouseprobe crypto security security_user autoExitInstall X services postInstall postInstallNonRooted); #- TODO modules bootloader local $o->{partitioning}{auto_allocate} = !$b_replay; $o->{autoExitInstall} = !$b_replay; @@ -1270,7 +1270,6 @@ sub set_security { my ($o) = @_; require security::various; security::level::set($o->{security}); - security::various::config_libsafe($::prefix, $o->{libsafe}); security::various::config_security_user($::prefix, $o->{security_user}); } diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm index 518ef8d18..3dd0682f2 100644 --- a/perl-install/install/steps.pm +++ b/perl-install/install/steps.pm @@ -789,7 +789,6 @@ sub miscellaneousBefore { require security::various; $o->{security} ||= security::level::get(); $o->{security_user} ||= security::various::config_security_user($::prefix); - $o->{libsafe} ||= security::various::config_libsafe($::prefix); log::l("security level is $o->{security}"); } diff --git a/perl-install/security/various.pm b/perl-install/security/various.pm index e9147f52f..140eed5c4 100644 --- a/perl-install/security/various.pm +++ b/perl-install/security/various.pm @@ -5,17 +5,6 @@ use strict; use common; -sub config_libsafe { - my $setting = @_ > 1; - my ($prefix, $libsafe) = @_; - if ($setting) { - addVarsInSh("$prefix/etc/sysconfig/system", { LIBSAFE => bool2yesno($libsafe) }); - } else { - my %t = getVarsFromSh("$prefix/etc/sysconfig/system"); - text2bool($t{LIBSAFE}); - } -} - sub config_security_user { my $setting = @_ > 1; my ($prefix, $sec_user) = @_; -- cgit v1.2.1