diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-04-21 16:28:48 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-04-21 16:28:48 +0000 |
| commit | 4326e8ff7f09d12c137f3a22c78bbdfb57b738ff (patch) | |
| tree | 353761675dc1d500fc144a955905ff6619bec247 | |
| parent | 44681afa40d50c3abed186ba405ee6a1aaeeb739 (diff) | |
| download | drakx-4326e8ff7f09d12c137f3a22c78bbdfb57b738ff.tar drakx-4326e8ff7f09d12c137f3a22c78bbdfb57b738ff.tar.gz drakx-4326e8ff7f09d12c137f3a22c78bbdfb57b738ff.tar.bz2 drakx-4326e8ff7f09d12c137f3a22c78bbdfb57b738ff.tar.xz drakx-4326e8ff7f09d12c137f3a22c78bbdfb57b738ff.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/install_steps.pm | 4 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index ea2444e68..6ba1ebb13 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -742,7 +742,9 @@ sub setupBootloader($) { } elsif (arch() =~ /^sparc/) { silo::install($o->{prefix}, $o->{bootloader}); } else { - lilo::install($o->{prefix}, $o->{bootloader}, $o->{fstab}, $o->{hds}); + $o->{lnx4win} ? + lilo::install_loadlin($o->{prefix}, $o->{bootloader}, $o->{fstab}) : + lilo::install($o->{prefix}, $o->{bootloader}, $o->{fstab}, $o->{hds}); } } diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index ac71b01b0..dea678cfd 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -616,10 +616,7 @@ sub setRootPassword { $::beginner ? () : "setRootPasswordNIS"); $o->ask_from_entries_refH([_("Set root password"), _("Ok"), $o->{security} > 2 || $::corporate ? () : _("No password")], - [ _("Set root password"), - $::beginner ? "\n" . -_("(a user ``mandrake'' with password ``mandrake'' has been automatically added)") : () - ], [ + [ _("Set root password"), "\n" ], [ _("Password") => { val => \$sup->{password}, hidden => 1 }, _("Password (again)") => { val => \$sup->{password2}, hidden => 1 }, $o->{installClass} eq "server" || $::expert ? ( |