From 6d357770b156ad68d35abee0a79057460d77e330 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 16 Nov 2004 09:40:45 +0000 Subject: don't write boot OF in /tmp/of_boot_dev, better use dev2yaboot() instead --- perl-install/any.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'perl-install/any.pm') diff --git a/perl-install/any.pm b/perl-install/any.pm index bf0678fc7..771aac480 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -139,9 +139,10 @@ Assign a new Volume ID?", $dev)))) { return; } } elsif (arch() =~ /ppc/) { - my $of_boot = cat_("$::prefix/tmp/of_boot_dev") || die "Can't open $::prefix/tmp/of_boot_dev"; - chop($of_boot); - $in->ask_warn('', N("You may need to change your Open Firmware boot-device to\n enable the bootloader. If you don't see the bootloader prompt at\n reboot, hold down Command-Option-O-F at reboot and enter:\n setenv boot-device %s,\\\\:tbxi\n Then type: shut-down\nAt your next boot you should see the bootloader prompt.", $of_boot)); + if (detect_devices::get_mac_model() !~ /IBM/) { + my $of_boot = bootloader::dev2yaboot($b->{boot}); + $in->ask_warn('', N("You may need to change your Open Firmware boot-device to\n enable the bootloader. If you don't see the bootloader prompt at\n reboot, hold down Command-Option-O-F at reboot and enter:\n setenv boot-device %s,\\\\:tbxi\n Then type: shut-down\nAt your next boot you should see the bootloader prompt.", $of_boot)); + } } 1; } -- cgit v1.2.1