diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-02-07 21:50:52 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-02-07 21:50:52 +0000 |
| commit | ed1db3884ceffd84d82021c3f5c2c0c7be73a796 (patch) | |
| tree | 71c8604aa8a7b1c979d11816c1d264f349858222 | |
| parent | dc423de69c436d3ca0db892687581ce036368ae6 (diff) | |
| download | drakx-backup-do-not-use-ed1db3884ceffd84d82021c3f5c2c0c7be73a796.tar drakx-backup-do-not-use-ed1db3884ceffd84d82021c3f5c2c0c7be73a796.tar.gz drakx-backup-do-not-use-ed1db3884ceffd84d82021c3f5c2c0c7be73a796.tar.bz2 drakx-backup-do-not-use-ed1db3884ceffd84d82021c3f5c2c0c7be73a796.tar.xz drakx-backup-do-not-use-ed1db3884ceffd84d82021c3f5c2c0c7be73a796.zip | |
create and use miscellaneousAfter (so that SECURE_LEVEL is set *after* asking)
| -rw-r--r-- | perl-install/install2.pm | 11 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 28 |
2 files changed, 21 insertions, 18 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 9820aa8bb..392a502f3 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -228,16 +228,7 @@ sub miscellaneous { installStepsCall($o, $auto, 'miscellaneousBefore', $clicked); installStepsCall($o, $auto, 'miscellaneous', $clicked); - - addToBeDone { - setVarsInSh("$o->{prefix}/etc/sysconfig/system", { - CLASS => $::expert && 'expert' || 'beginner', - SECURITY => $o->{security}, - META_CLASS => $o->{meta_class} || 'PowerPack', - }); - substInFile { s/KEYBOARD_AT_BOOT=.*/KEYBOARD_AT_BOOT=yes/ } "$o->{prefix}/etc/sysconfig/usb" if detect_devices::usbKeyboards(); - - } 'installPackages'; + installStepsCall($o, $auto, 'miscellaneousAfter', $clicked); } #------------------------------------------------------------------------------ diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index c83cb751c..9bf1830f9 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -928,21 +928,33 @@ sub miscellaneousBefore { $o->{miscellaneous}{HDPARM} ||= $s{HDPARM} if exists $s{HDPARM}; $o->{security} ||= $s{SECURITY} if exists $s{SECURITY}; + add2hash_($o->{miscellaneous} ||= {}, { numlock => !detect_devices::isLaptop() }); +} +sub miscellaneous { + my ($o) = @_; + #- keep some given parameters + #-TODO +} +sub miscellaneousAfter { + my ($o) = @_; + add2hash_ $o, { useSupermount => 1 && $o->{security} < 4 && arch() !~ /sparc/ && !$::corporate }; + $ENV{SECURE_LEVEL} = $o->{security}; addToBeDone { mkdir_p("$o->{prefix}/etc/security/msec"); symlink "server.$o->{security}", "$o->{prefix}/etc/security/msec/server" if $o->{security} > 3; } 'formatPartitions'; - - add2hash_ $o, { useSupermount => 1 && $o->{security} < 4 && arch() !~ /sparc/ && !$::corporate }; - add2hash_($o->{miscellaneous} ||= {}, { numlock => !detect_devices::isLaptop() }); -} -sub miscellaneous { - my ($o) = @_; - #- keep some given parameters - #-TODO + addToBeDone { + setVarsInSh("$o->{prefix}/etc/sysconfig/system", { + CLASS => $::expert && 'expert' || 'beginner', + SECURITY => $o->{security}, + META_CLASS => $o->{meta_class} || 'PowerPack', + }); + substInFile { s/KEYBOARD_AT_BOOT=.*/KEYBOARD_AT_BOOT=yes/ } "$o->{prefix}/etc/sysconfig/usb" if detect_devices::usbKeyboards(); + + } 'installPackages'; } #------------------------------------------------------------------------------ |