diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/bootloader.pm | 2 | ||||
| -rw-r--r-- | perl-install/mouse.pm | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index eb0165df9..b2b91278e 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -491,7 +491,7 @@ sub install_yaboot($$$) { print F "$_->{type}=$of_dev,$_->{kernel_or_dev}"; print F "\tlabel=", substr($_->{label}, 0, 15); #- lilo doesn't handle more than 15 char long labels print F "\troot=$_->{root}"; - print F "\tinitrd=$_->{initrd}" if $_->{initrd}; + print F "\tinitrd=$of_dev,$_->{initrd}" if $_->{initrd}; print F "\tappend=\"$_->{append}\"" if $_->{append}; print F "\tread-write" if $_->{'read-write'}; print F "\tread-only" if !$_->{'read-write'}; diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm index 815d64f7c..ec8571f39 100644 --- a/perl-install/mouse.pm +++ b/perl-install/mouse.pm @@ -63,7 +63,8 @@ my %mice = __("busmouse") => [ [ arch() eq 'ppc' ? 'adbmouse' : ('atibm', 'inportbm', 'logibm') ], - [ [ 2, 'Busmouse', 'BusMouse', __("2 buttons") ], + [ if_(arch() eq 'ppc', [ 1, 'Busmouse', 'BusMouse', __("1 button") ]), + [ 2, 'Busmouse', 'BusMouse', __("2 buttons") ], [ 3, 'Busmouse', 'BusMouse', __("3 buttons") ], ]], @@ -199,7 +200,7 @@ sub detect() { "USB|Generic" : # No need to search for an ADB mouse. If I did, the PPC kernel would # find one whether or not I had one installed! So.. default to it. - "busmouse|2 buttons"); + "busmouse|1 button"); } if ($::isStandalone) { |