summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-03-11 11:35:20 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-03-11 11:35:20 +0000
commit78b5d86133063481e8d9e3f40f5273fa0d969e8b (patch)
treedea43f9a499767e1b2d96ef29872ef27d6cd65ee
parent5e10797216589d50c9bdcd2c32d695e6ba81ca35 (diff)
downloaddrakx-78b5d86133063481e8d9e3f40f5273fa0d969e8b.tar
drakx-78b5d86133063481e8d9e3f40f5273fa0d969e8b.tar.gz
drakx-78b5d86133063481e8d9e3f40f5273fa0d969e8b.tar.bz2
drakx-78b5d86133063481e8d9e3f40f5273fa0d969e8b.tar.xz
drakx-78b5d86133063481e8d9e3f40f5273fa0d969e8b.zip
- default security level now set in miscellaneousBefore
- default security level is 3 in meta_class server
-rw-r--r--perl-install/install2.pm1
-rw-r--r--perl-install/install_steps.pm4
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 9efa3358a..a15b089ca 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -38,7 +38,6 @@ $o = $::o = {
mkbootdisk => 0, #- no mkbootdisk if 0 or undef, find a floppy with 1, or fd1
#- packages => [ qw() ],
partitioning => { clearall => 0, eraseBadPartitions => 0, auto_allocate => 0 }, #-, readonly => 0 },
- security => 2,
authentication => { md5 => 1, shadow => 1 },
lang => 'en_US',
isUpgrade => 0,
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index c36d6589d..838fdde6b 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -934,7 +934,9 @@ 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->{security};
+ $o->{security} ||= any::get_secure_level($o->{prefix}) || ($o->{meta_class} eq 'server' ? 3 : 2);
+
+ log::l("security $o->{security}");
add2hash_($o->{miscellaneous} ||= {}, { numlock => !detect_devices::isLaptop() });
}