diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-03-26 21:30:07 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-03-26 21:30:07 +0000 |
| commit | 3600a1fd1e9398fad208e3e94c6def2a8e84314a (patch) | |
| tree | d2a5701e3436aff6a7c61e29f8254164505f23f4 /perl-install/install_steps.pm | |
| parent | aaab5d0fa8f4a6eef4c1d2ee6af9651f6e576db5 (diff) | |
| download | drakx-backup-do-not-use-3600a1fd1e9398fad208e3e94c6def2a8e84314a.tar drakx-backup-do-not-use-3600a1fd1e9398fad208e3e94c6def2a8e84314a.tar.gz drakx-backup-do-not-use-3600a1fd1e9398fad208e3e94c6def2a8e84314a.tar.bz2 drakx-backup-do-not-use-3600a1fd1e9398fad208e3e94c6def2a8e84314a.tar.xz drakx-backup-do-not-use-3600a1fd1e9398fad208e3e94c6def2a8e84314a.zip | |
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
| -rw-r--r-- | perl-install/install_steps.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index ab9c4ab24..3bef8b6bf 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -293,7 +293,7 @@ Consoles 1,3,4,7 may also contain interesting information"; my $pkg = pkgs::packageByName($o->{packages}, 'urpmi'); if ($pkg && pkgs::packageFlagSelected($pkg)) { - install_any::install_urpmi($o->{prefix}, $o->{method}); + install_any::install_urpmi($o->{prefix}, $o->{method}, $o->{packages}[2]); substInFile { s/^urpmi\n//; $_ .= "urpmi\n" if eof } "$msec/group.conf" if -d $msec; } @@ -584,10 +584,10 @@ sub createBootdisk($) { if (arch() =~ /^sparc/) { require silo; - silo::mkbootdisk($o->{prefix}, install_any::kernelVersion(), $dev, $o->{bootloader}{perImageAppend}); + silo::mkbootdisk($o->{prefix}, install_any::kernelVersion($o), $dev, $o->{bootloader}{perImageAppend}); } else { require lilo; - lilo::mkbootdisk($o->{prefix}, install_any::kernelVersion(), $dev, $o->{bootloader}{perImageAppend}); + lilo::mkbootdisk($o->{prefix}, install_any::kernelVersion($o), $dev, $o->{bootloader}{perImageAppend}); } $o->{mkbootdisk} = $dev; } @@ -637,10 +637,10 @@ sub setupBootloaderBefore { } } elsif (arch() =~ /^sparc/) { require silo; - silo::suggest($o->{prefix}, $o->{bootloader}, $o->{hds}, $o->{fstab}, install_any::kernelVersion()); + silo::suggest($o->{prefix}, $o->{bootloader}, $o->{hds}, $o->{fstab}, install_any::kernelVersion($o)); } else { require lilo; - lilo::suggest($o->{prefix}, $o->{bootloader}, $o->{hds}, $o->{fstab}, install_any::kernelVersion()); + lilo::suggest($o->{prefix}, $o->{bootloader}, $o->{hds}, $o->{fstab}, install_any::kernelVersion($o)); lilo::suggest_floppy($o->{bootloader}) if $o->{security} <= 3; $o->{bootloader}{keytable} ||= keyboard::keyboard2kmap($o->{keyboard}); } |