diff options
author | 2005-07-28 15:29:38 +0000 | |
---|---|---|
committer | 2005-07-28 15:29:38 +0000 | |
commit | a929cce979750cd33920a6e018fce85e7fa685a8 (patch) | |
tree | eabbf35ef4a19c0c61a9b6bf23711eaddca1774e | |
parent | Added support for eclasses to the local.start file, for GLI. (diff) | |
download | gentoo-a929cce979750cd33920a6e018fce85e7fa685a8.tar.gz gentoo-a929cce979750cd33920a6e018fce85e7fa685a8.tar.bz2 gentoo-a929cce979750cd33920a6e018fce85e7fa685a8.zip |
Don't perform yaboot tasks for pegasos kernels, and generally improving support for genkernel's --genzimage option.
-rw-r--r-- | src/catalyst/ChangeLog | 7 | ||||
-rw-r--r-- | src/catalyst/livecd/runscript/ppc-archscript.sh | 90 |
2 files changed, 56 insertions, 41 deletions
diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog index cafa320065..95884cc5f9 100644 --- a/src/catalyst/ChangeLog +++ b/src/catalyst/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.120 2005/07/28 14:10:58 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.121 2005/07/28 15:29:38 wolf31o2 Exp $ + + 28 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> + livecd/runscript/ppc-archscript.sh: + Don't perform yaboot tasks for pegasos kernels, and generally improving + support for genkernel's --genzimage option. 28 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> livecd/files/livecd-local.start: diff --git a/src/catalyst/livecd/runscript/ppc-archscript.sh b/src/catalyst/livecd/runscript/ppc-archscript.sh index c54163b7e8..7f6735d690 100644 --- a/src/catalyst/livecd/runscript/ppc-archscript.sh +++ b/src/catalyst/livecd/runscript/ppc-archscript.sh @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/ppc-archscript.sh,v 1.10.2.7 2005/07/05 21:47:46 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/ppc-archscript.sh,v 1.10.2.8 2005/07/28 15:29:38 wolf31o2 Exp $ case $1 in kernel) @@ -32,37 +32,11 @@ case $1 in [ -z "${clst_boot_kernel}" ] && die "Required key boot/kernel not defined, exiting." first="" - for x in ${clst_boot_kernel} - do - kbinary="${clst_chroot_path}/usr/portage/packages/gk_binaries/${x}-${clst_version_stamp}.tar.bz2" - if [ -z "${first}" ] - then - # grab name of first kernel - first="${x}" - fi - [ ! -e "${kbinary}" ] && die "Can't find kernel tarball at ${kbinary}" - /bin/tar xjvf ${kbinary} -C ${clst_cdroot_path}/boot - - # change kernel name from "kernel" to "gentoo", for example - mv ${clst_cdroot_path}/boot/kernel* ${clst_cdroot_path}/boot/${x} - - # change initrd name from "initrd" to "gentoo.igz", for example - if [ -e ${clst_cdroot_path}/boot/initrd* ] - then - mv "${clst_cdroot_path}"/boot/initrd* "${clst_cdroot_path}"/boot/"${x}".igz - fi - - if [ -e ${clst_cdroot_path}/boot/initramfs* ] - then - mv "${clst_cdroot_path}"/boot/initramfs* "${clst_cdroot_path}"/boot/"${x}".igz - fi - done - - # the rest of this function sets up the config file for yaboot + # this sets up the config file for yaboot icfg=${clst_cdroot_path}/boot/yaboot.conf kmsg=${clst_cdroot_path}/boot/boot.msg echo "default ${first}" > ${icfg} - echo "timeout 150" >> ${icfg} + echo "timeout 300" >> ${icfg} echo "device=cd:" >> ${icfg} echo "root=/dev/ram" >> ${icfg} echo "fgcolor=white" >> ${icfg} @@ -89,21 +63,57 @@ case $1 in for x in ${clst_boot_kernel} do - eval custom_kopts=\$${x}_kernelopts - echo "APPENDING CUSTOM KERNEL ARGS: ${custom_kopts}" - echo >> ${icfg} - echo "image=/boot/${x}" >> ${icfg} - echo "initrd=/boot/${x}.igz" >> ${icfg} - echo "label=${x}" >> ${icfg} - echo "read-write" >> ${icfg} - - if [ "${clst_livecd_splash_type}" == "gensplash" -a -n "${clst_livecd_splash_theme}" ] + kbinary="${clst_chroot_path}/usr/portage/packages/gk_binaries/${x}-${clst_version_stamp}.tar.bz2" + if [ -z "${first}" ] then - echo "append=\"init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot splash=silent,theme:${clst_livecd_splash_theme}\"" >> ${icfg} + # grab name of first kernel + first="${x}" + fi + [ ! -e "${kbinary}" ] && die "Can't find kernel tarball at ${kbinary}" + /bin/tar xjvf ${kbinary} -C ${clst_cdroot_path}/boot + + # change kernel name from "kernel" to "gentoo", for example + if [ -e ${clst_cdroot_path}/boot/kernelz-* ] + then + mv ${clst_cdroot_path}/boot/kernelz-* ${clst_cdroot_path}/boot/${x} else - echo "append=\"initrd=${x}.igz init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot splash=silent\"" >> ${icfg} + mv ${clst_cdroot_path}/boot/kernel-* ${clst_cdroot_path}/boot/${x} + # change initrd name from "initrd" to "gentoo.igz", for example + if [ -e ${clst_cdroot_path}/boot/initrd* ] + then + mv "${clst_cdroot_path}"/boot/initrd* "${clst_cdroot_path}"/boot/"${x}".igz + fi + + if [ -e ${clst_cdroot_path}/boot/initramfs* ] + then + mv "${clst_cdroot_path}"/boot/initramfs* "${clst_cdroot_path}"/boot/"${x}".igz + fi + eval custom_kopts=\$${x}_kernelopts + echo "APPENDING CUSTOM KERNEL ARGS: ${custom_kopts}" + echo >> ${icfg} + echo "image=/boot/${x}" >> ${icfg} + echo "initrd=/boot/${x}.igz" >> ${icfg} + echo "label=${x}" >> ${icfg} + echo "read-write" >> ${icfg} + + if [ "${clst_livecd_splash_type}" == "gensplash" -a -n "${clst_livecd_splash_theme}" ] + then + echo "append=\"init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot splash=silent,theme:${clst_livecd_splash_theme}\"" >> ${icfg} + else + echo "append=\"initrd=${x}.igz init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot splash=silent\"" >> ${icfg} + fi fi done + + + + + + + for x in ${clst_boot_kernel} + do + + done ;; cdfs) |