diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-11-16 09:40:45 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-11-16 09:40:45 +0000 |
| commit | 6d357770b156ad68d35abee0a79057460d77e330 (patch) | |
| tree | 802bdab15d569fc0e6be0f68d2c7858da995ba09 | |
| parent | 0e6f5ac2bfb2bd2ebd481b55dc9b63c78d81b9dc (diff) | |
| download | drakx-backup-do-not-use-6d357770b156ad68d35abee0a79057460d77e330.tar drakx-backup-do-not-use-6d357770b156ad68d35abee0a79057460d77e330.tar.gz drakx-backup-do-not-use-6d357770b156ad68d35abee0a79057460d77e330.tar.bz2 drakx-backup-do-not-use-6d357770b156ad68d35abee0a79057460d77e330.tar.xz drakx-backup-do-not-use-6d357770b156ad68d35abee0a79057460d77e330.zip | |
don't write boot OF in /tmp/of_boot_dev, better use dev2yaboot() instead
| -rw-r--r-- | perl-install/any.pm | 7 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 4 |
2 files changed, 4 insertions, 7 deletions
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; } diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index ecb5428d7..18beed706 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -986,10 +986,6 @@ sub install_yaboot { } sub when_config_changed_yaboot { my ($bootloader) = @_; - if ($bootloader->{boot}) { - my $of_dev = get_of_dev($bootloader->{boot}); - output("$::prefix/tmp/of_boot_dev", "$of_dev\n"); - } $::testing and return; if (defined $install_steps_interactive::new_bootstrap) { run_program::run("hformat", $bootloader->{boot}) or die "hformat failed"; |