From d1a07a8824204f4895f5ae07cec3e04745fc7d26 Mon Sep 17 00:00:00 2001 From: fake Date: Mon, 13 Dec 2004 16:44:54 +0000 Subject: [PATCH] fake: livecd/sparc: bring up to par with bootdisk's sparc stuff [2004120913590532461] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5176 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- target/livecd/sparc/build.sh | 9 +++++---- target/livecd/sparc/silo.conf | 15 +++++---------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/target/livecd/sparc/build.sh b/target/livecd/sparc/build.sh index d5933f455..d5921b6a4 100644 --- a/target/livecd/sparc/build.sh +++ b/target/livecd/sparc/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 echo_header "Creating silo setup:" # @@ -20,8 +20,9 @@ echo_status "Moving image (initrd) to boot directory." mv -v initrd.gz boot/ # buildroot="build/${ROCKCFG_ID}" -datadir="build/${ROCKCFG_ID}/ROCK/bootdisk" +datadir="build/${ROCKCFG_ID}/ROCK/livecd" cat > ../isofs_arch.txt <<- EOT BOOT -G $buildroot/boot/isofs.b -B ... - DISK1 $datdir/boot/ boot/ + DISK1 $datadir/boot/ boot/ EOT + diff --git a/target/livecd/sparc/silo.conf b/target/livecd/sparc/silo.conf index 1f143faea..0d045e9ca 100644 --- a/target/livecd/sparc/silo.conf +++ b/target/livecd/sparc/silo.conf @@ -1,21 +1,16 @@ - partition=1 -default=livecd -read-write timeout=100 message=/boot/boot.msg +default=livecd +root=/dev/ram +initrd=/boot/initrd.gz +read-write +append="devfs=nocompat init=/linuxrc" image[sun4u]=/boot/vmlinux64.gz label=livecd alias=linux - initrd=/boot/initrd.gz - ramdisk=8388608 - append="root=/dev/ram devfs=nocompat init=/linuxrc rw" - image[sun4c,sun4d,sun4m]=/boot/vmlinux.gz label=livecd alias=linux - initrd=/boot/initrd.gz - ramdisk=8388608 - append="root=/dev/ram devfs=nocompat init=/linuxrc rw"