diff options
| author | Francois Pons <fpons@mandriva.com> | 1999-11-23 10:57:03 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 1999-11-23 10:57:03 +0000 |
| commit | c0d59d692d6359377dcaec158698624cd905f1de (patch) | |
| tree | 2beb37b495d381ae254399841f2d49061d353621 | |
| parent | 2fd3662221221de552a42cd29e6e256bb5915c11 (diff) | |
| download | drakx-backup-do-not-use-c0d59d692d6359377dcaec158698624cd905f1de.tar drakx-backup-do-not-use-c0d59d692d6359377dcaec158698624cd905f1de.tar.gz drakx-backup-do-not-use-c0d59d692d6359377dcaec158698624cd905f1de.tar.bz2 drakx-backup-do-not-use-c0d59d692d6359377dcaec158698624cd905f1de.tar.xz drakx-backup-do-not-use-c0d59d692d6359377dcaec158698624cd905f1de.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 4 | ||||
| -rw-r--r-- | perl-install/network.pm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 7d154bfe5..4a6d7384b 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -896,7 +896,7 @@ sub miscellaneous { 4 => _("High"), 5 => _("Paranoid"), ); - delete @l{0,4,5} unless $::expert; + delete @l{0,1,5} unless $::expert; my $u = $o->{miscellaneous} ||= {}; exists $u->{LAPTOP} or $u->{LAPTOP} = 1; @@ -908,7 +908,7 @@ sub miscellaneous { [ _("Is this machine a laptop?"), _("Use hard drive optimisations?"), _("Choose security level"), - _("Precise RAM size if needed (found %d MB)", availableRam / 1024), + _("Precise RAM size if needed (found %d MB)", availableRam / 1024 + 3), #- add three for correction. ], [ { val => \$u->{LAPTOP}, type => 'bool' }, { val => \$u->{HDPARM}, type => 'bool', text => _("(may cause data corruption)") }, diff --git a/perl-install/network.pm b/perl-install/network.pm index fa5b1f3e9..9ddde836f 100644 --- a/perl-install/network.pm +++ b/perl-install/network.pm @@ -57,7 +57,7 @@ sub write_conf { }); add2hash($netc, { DOMAINNAME => $netc->{HOSTNAME} =~ /\.(.*)/ }); - setVarsInSh($file, $netc, qw(NETWORKING FORWARD_IPV4 HOSTNAME DOMAINNAME GATEWAY GATEWAYDEV)); + setVarsInSh($file, $netc, qw(NETWORKING FORWARD_IPV4 HOSTNAME DOMAINNAME GATEWAY GATEWAYDEV NISDOMAIN)); } sub write_resolv_conf { |