diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-08-28 19:50:35 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-08-28 19:50:35 +0000 |
| commit | 54410dc53bd985c6a7a0eb4942004880eaed7c9d (patch) | |
| tree | 5d824b28ee2f4e03c2c5d41fef1b5e2cc536f501 | |
| parent | e94ae685f0dea15ec01eabfb18e671eb1a4ecb9e (diff) | |
| download | drakx-backup-do-not-use-54410dc53bd985c6a7a0eb4942004880eaed7c9d.tar drakx-backup-do-not-use-54410dc53bd985c6a7a0eb4942004880eaed7c9d.tar.gz drakx-backup-do-not-use-54410dc53bd985c6a7a0eb4942004880eaed7c9d.tar.bz2 drakx-backup-do-not-use-54410dc53bd985c6a7a0eb4942004880eaed7c9d.tar.xz drakx-backup-do-not-use-54410dc53bd985c6a7a0eb4942004880eaed7c9d.zip | |
- use $::prefix in any::get_secure_level()
- fix any::get_secure_level() not using prefix when it should
| -rw-r--r-- | perl-install/any.pm | 8 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 4e27cbaa4..cba30c7ee 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -1128,11 +1128,9 @@ sub ask_window_manager_to_logout { } sub get_secure_level { - my ($prefix) = @_; - - cat_("/etc/profile") =~ /export SECURE_LEVEL=(\d+)/ && $1 || #- 8.0 msec - cat_("/etc/profile.d/msec.sh") =~ /export SECURE_LEVEL=(\d+)/ && $1 || #- 8.1 msec - ${{ getVarsFromSh("$prefix/etc/sysconfig/msec") }}{SECURE_LEVEL} || #- 8.2 msec + cat_("$::prefix/etc/profile") =~ /export SECURE_LEVEL=(\d+)/ && $1 || #- 8.0 msec + cat_("$::prefix/etc/profile.d/msec.sh") =~ /export SECURE_LEVEL=(\d+)/ && $1 || #- 8.1 msec + ${{ getVarsFromSh("$::prefix/etc/sysconfig/msec") }}{SECURE_LEVEL} || #- 8.2 msec $ENV{SECURE_LEVEL}; } diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 8154b2f93..989fcba41 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -934,7 +934,7 @@ 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->{prefix}) || ($o->{meta_class} =~ /server|firewall/ ? 3 : 2); + $o->{security} ||= any::get_secure_level() || ($o->{meta_class} =~ /server|firewall/ ? 3 : 2); log::l("security $o->{security}"); |