From 2f0e0f6f21cf3263c762f93be107ce6235e6a520 Mon Sep 17 00:00:00 2001
From: Stew Benedict <stewb@mandriva.org>
Date: Tue, 29 Oct 2002 21:23:57 +0000
Subject: Reflect changes in yaboot package.

---
 perl-install/bootloader.pm |  8 ++++----
 rescue/list.ppc            | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 837908c57..9a9470786 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -588,7 +588,7 @@ sub get_of_dev {
 	my ($unix_dev) = @_;
 	#- don't care much for this - need to run ofpath rooted, and I need the result
 	#- In test mode, just run on "/", otherwise you can't get to the /proc files		
-	run_program::rooted_or_die($::prefix, "/usr/local/sbin/ofpath $unix_dev", ">", "/tmp/ofpath");
+	run_program::rooted_or_die($::prefix, "/usr/sbin/ofpath $unix_dev", ">", "/tmp/ofpath");
 	open(FILE, "$::prefix/tmp/ofpath") || die "Can't open $::prefix/tmp/ofpath";
 	my $of_dev = "";
 	local $_ = "";
@@ -629,8 +629,8 @@ sub install_yaboot {
 	}
 	
 	$lilo->{$_} and print F "$_=$lilo->{$_}" foreach qw(delay timeout);
-	print F "install=/usr/local/lib/yaboot/yaboot";
-	print F "magicboot=/usr/local/lib/yaboot/ofboot";
+	print F "install=/usr/lib/yaboot/yaboot";
+	print F "magicboot=/usr/lib/yaboot/ofboot";
 	$lilo->{$_} and print F $_ foreach qw(enablecdboot enableofboot);
 	$lilo->{$_} and print F "$_=$lilo->{$_}" foreach qw(defaultos default);
 	#- print F "nonvram";
@@ -673,7 +673,7 @@ sub install_yaboot {
     if (defined $install_steps_interactive::new_bootstrap) {
 	run_program::run("hformat", "$lilo->{boot}") or die "hformat failed";
     }	
-    run_program::rooted_or_die($::prefix, "/sbin/ybin", "2>", "/tmp/.error");
+    run_program::rooted_or_die($::prefix, "/usr/sbin/ybin", "2>", "/tmp/.error");
     unlink "$::prefix/tmp/.error";	
 }
 
diff --git a/rescue/list.ppc b/rescue/list.ppc
index faa790220..d81d4a268 100644
--- a/rescue/list.ppc
+++ b/rescue/list.ppc
@@ -1,9 +1,9 @@
 /usr/lib/perl5/PERL_VERSION/ppc-linux-thread-multi/CORE/libperl.so
 /sbin/pdisk
-/sbin/ybin
-/sbin/mkofboot
-/usr/local/lib/yaboot/ofboot
-/usr/local/lib/yaboot/yaboot
-/usr/local/sbin/ofpath
+/usr/sbin/ybin
+/usr/sbin/mkofboot
+/usr/lib/yaboot/ofboot
+/usr/lib/yaboot/yaboot
+/usr/sbin/ofpath
 /sbin/nvsetenv
 /usr/bin/hformat
-- 
cgit v1.2.1