summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorStew Benedict <stewb@mandriva.org>2001-03-23 15:58:57 +0000
committerStew Benedict <stewb@mandriva.org>2001-03-23 15:58:57 +0000
commit12f60f7718cd07ff5fa550da97b14c9a84f259df (patch)
treeecfc52e57b25a945a0f8c657de22092a4ec2fd93 /perl-install
parentac30b4c6f5f2de8dbe4f72e58314d5042de9f719 (diff)
downloaddrakx-12f60f7718cd07ff5fa550da97b14c9a84f259df.tar
drakx-12f60f7718cd07ff5fa550da97b14c9a84f259df.tar.gz
drakx-12f60f7718cd07ff5fa550da97b14c9a84f259df.tar.bz2
drakx-12f60f7718cd07ff5fa550da97b14c9a84f259df.tar.xz
drakx-12f60f7718cd07ff5fa550da97b14c9a84f259df.zip
mods to create/move image, to /export for PPC, use vmlinux for PPC
prepend of_dev to initrd stanza in yaboot.conf add 1-button mouse for PPC
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/bootloader.pm2
-rw-r--r--perl-install/mouse.pm5
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) {