diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 1999-12-05 23:13:43 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 1999-12-05 23:13:43 +0000 |
| commit | acbcf359e5e63583f01c06ecbc4346664c443aa0 (patch) | |
| tree | c572b519c806b4dbd69e22f2d3133f24f06dfec0 /perl-install/install_steps.pm | |
| parent | 6e75349144478ac58cb29697e31d2339d2d0a971 (diff) | |
| download | drakx-backup-do-not-use-acbcf359e5e63583f01c06ecbc4346664c443aa0.tar drakx-backup-do-not-use-acbcf359e5e63583f01c06ecbc4346664c443aa0.tar.gz drakx-backup-do-not-use-acbcf359e5e63583f01c06ecbc4346664c443aa0.tar.bz2 drakx-backup-do-not-use-acbcf359e5e63583f01c06ecbc4346664c443aa0.tar.xz drakx-backup-do-not-use-acbcf359e5e63583f01c06ecbc4346664c443aa0.zip | |
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
| -rw-r--r-- | perl-install/install_steps.pm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 4de59ed3a..ef9fe5114 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -193,7 +193,7 @@ sub installPackages($$) { my ($o, $packages) = @_; #- hack to ensure proper ordering for installation of packages. - my @firstToInstall = qw(basesystem sed); + my @firstToInstall = qw(setup basesystem sed); my %firstInstalled; my @toInstall; foreach (@firstToInstall) { @@ -215,8 +215,6 @@ sub afterInstallPackages($) { #- why not? cuz weather is nice today :-) [pixel] sync(); sync(); - run_program::rooted($o->{prefix}, "kudzu", "-q"); # -q <=> fermetagueuleconnard - $o->pcmciaConfig(); #- miscellaneous @@ -268,7 +266,7 @@ sub pppConfig { my %toreplace; $toreplace{$_} = $o->{modem}{$_} foreach qw(connection phone login passwd auth domain); - $toreplace{kpppauth} = ${{ 'Script-based' => 0, PAP => 1, 'Terminal-based' => 2, CHAP => 3, }}{$o->{modem}{auth}}; + $toreplace{kpppauth} = ${{ 'Script-based' => 0, PAP => 1, 'Terminal-based' => 2, CHAP => 3, }}{$o->{modem}{auth}}; #' $toreplace{phone} =~ s/[^\d]//g; $toreplace{dnsserver} = join '', map { "$o->{modem}{$_}," } "dns1", "dns2"; @@ -566,7 +564,7 @@ sub miscellaneous { $ENV{SECURE_LEVEL} = $o->{security}; cat_("/proc/cmdline") =~ /mem=(\S+)/; - add2hash_($o->{miscellaneous} ||= {}, { numlock => !$o->{pcmcia}, $1 ? (memsize => $1 + 3) : () }); + add2hash_($o->{miscellaneous} ||= {}, { numlock => !$o->{pcmcia}, $1 ? (memsize => $1) : () }); } #------------------------------------------------------------------------------ |