From 5476d52b4dbbc9d1722434017bec85227d53cc3b Mon Sep 17 00:00:00 2001
From: fake <fake@rapidnetworks.de>
Date: Sun, 10 Oct 2004 11:36:32 +0000
Subject: [PATCH] fake: 	livecd/powerpc: fix ofboot.b, the new 	yaboot seems
 to be picky about this 	clean up more in /boot and other stuff

[2004092523401901787] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4472 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 target/livecd/powerpc/build.sh | 8 ++++----
 target/livecd/powerpc/ofboot.b | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/target/livecd/powerpc/build.sh b/target/livecd/powerpc/build.sh
index 8244097d8..1618dca5a 100644
--- a/target/livecd/powerpc/build.sh
+++ b/target/livecd/powerpc/build.sh
@@ -1,8 +1,8 @@
 
 cd $disksdir
 
-echo_header "Creating cleaning boot directory:"
-rm -rfv boot/*-rock boot/System.map boot/kconfig*
+echo_header "Cleaning boot directory:"
+rm -rfv boot/*-rock boot/System.map boot/kconfig* boot/initrd*.img boot/*.b boot/second
 
 echo_header "Creating yaboot setup:"
 #
@@ -14,7 +14,7 @@ tar --use-compress-program=bzip2 \
 tar --use-compress-program=bzip2 \
     -xf $base/build/${ROCKCFG_ID}/ROCK/pkgs/yaboot.tar.bz2 \
     usr/lib/yaboot/yaboot.rs6k -O > boot/yaboot.rs6k
-cp boot/yaboot.rs6k install.bin
+mv boot/yaboot.rs6k install.bin
 #
 echo_status "Creating yaboot config files."
 cp -v $base/target/$target/powerpc/{boot.msg,ofboot.b} \
@@ -38,7 +38,7 @@ datadir="build/${ROCKCFG_ID}/ROCK/livecd"
 cat > ../isofs_arch.txt <<- EOT
 	BOOT	-hfs -part -map $datadir/mapping -hfs-volid "ROCK_Linux_CD"
 	BOOTx	-hfs-bless boot -sysid PPC -l -L -r -T -chrp-boot
-	BOOTx   --prep-boot install.bin
+	BOOTx   -prep-boot install.bin
 	DISK1	$datadir/boot/ boot/
 	DISK1	$datadir/etc/ etc/
 	DISK1	$datadir/install.bin install.bin
diff --git a/target/livecd/powerpc/ofboot.b b/target/livecd/powerpc/ofboot.b
index 3b6187718..8b5b4d663 100644
--- a/target/livecd/powerpc/ofboot.b
+++ b/target/livecd/powerpc/ofboot.b
@@ -1,14 +1,14 @@
 <CHRP-BOOT>
 <COMPATIBLE>
-MacRISC MacRISC3
+MacRISC MacRISC3 MacRISC4
 </COMPATIBLE>
 <DESCRIPTION>
-GNU/Linux PPC bootloader
+ROCK Linux Live CD Bootloader
 </DESCRIPTION>
 <BOOT-SCRIPT>
 " screen" output
 load-base release-load-area
-boot cd:,\\yaboot
+boot cd:,\boot\yaboot
 </BOOT-SCRIPT>
 <OS-BADGE-ICONS>
 1010