diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2005-07-12 15:21:29 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2005-07-12 15:21:29 +0000 |
| commit | f1e6b425aa21f3e8d88341e59f58e4b5917ec917 (patch) | |
| tree | fb5c2684cd7aebb1c02b21a086a40a38df5f0ecf | |
| parent | Changed x86-help.msg to point users to new README.txt file, rather than tryin... (diff) | |
| download | gentoo-f1e6b425aa21f3e8d88341e59f58e4b5917ec917.tar.gz gentoo-f1e6b425aa21f3e8d88341e59f58e4b5917ec917.tar.bz2 gentoo-f1e6b425aa21f3e8d88341e59f58e4b5917ec917.zip | |
Fixed ia64-archscript.sh with patch from plasmaroo. This is catalyst 1.1.10.2.
| -rw-r--r-- | src/catalyst/ChangeLog | 6 | ||||
| -rw-r--r-- | src/catalyst/catalyst | 4 | ||||
| -rw-r--r-- | src/catalyst/livecd/runscript/ia64-archscript.sh | 12 |
3 files changed, 13 insertions, 9 deletions
diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog index 80a2bc31ec..1be5cf57c9 100644 --- a/src/catalyst/ChangeLog +++ b/src/catalyst/ChangeLog @@ -1,6 +1,10 @@ # 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.93 2005/07/11 21:33:46 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.94 2005/07/12 15:21:29 wolf31o2 Exp $ + + 12 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, + livecd/runscript/ia64-archscript.sh: + Fixed ia64-archscript.sh with patch from plasmaroo. This is catalyst 1.1.10.2. 11 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> livecd/files/x86-help.msg: diff --git a/src/catalyst/catalyst b/src/catalyst/catalyst index 094d6a9df4..88be5a461f 100644 --- a/src/catalyst/catalyst +++ b/src/catalyst/catalyst @@ -1,12 +1,12 @@ #!/usr/bin/python # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/catalyst,v 1.68.2.23 2005/07/08 13:04:56 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/catalyst,v 1.68.2.24 2005/07/12 15:21:29 wolf31o2 Exp $ import os,sys,imp,string,getopt __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>" -__version__="1.1.10" +__version__="1.1.10.2" conf_values={} diff --git a/src/catalyst/livecd/runscript/ia64-archscript.sh b/src/catalyst/livecd/runscript/ia64-archscript.sh index 349ffc4855..0f4f4ab63b 100644 --- a/src/catalyst/livecd/runscript/ia64-archscript.sh +++ b/src/catalyst/livecd/runscript/ia64-archscript.sh @@ -1,7 +1,7 @@ #!/bin/bash # 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/ia64-archscript.sh,v 1.1.2.4 2005/07/05 21:47:46 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/ia64-archscript.sh,v 1.1.2.5 2005/07/12 15:21:29 wolf31o2 Exp $ case $1 in kernel) @@ -34,16 +34,16 @@ case $1 in /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} + mv ${clst_cdroot_path}/boot/kernel* ${clst_cdroot_path}/boot/efi/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 + mv "${clst_cdroot_path}"/boot/initrd* "${clst_cdroot_path}"/boot/efi/boot/"${x}".igz fi if [ -e ${clst_cdroot_path}/boot/initramfs* ] then - mv "${clst_cdroot_path}"/boot/initramfs* "${clst_cdroot_path}"/boot/"${x}".igz + mv "${clst_cdroot_path}"/boot/initramfs* "${clst_cdroot_path}"/boot/efi/boot/"${x}".igz fi done @@ -76,12 +76,12 @@ case $1 in do echo "image=/efi/boot/${x}" >> ${iacfg} echo " label=${x}" >> ${iacfg} - echo ' append="initrd=${x}.igz root=/dev/ram0 init=/linuxrc acpi=off ${cmdline_opts} ${custom_kopts} cdroot"' >> ${iacfg} + echo " append=\"initrd=${x}.igz root=/dev/ram0 init=/linuxrc acpi=off ${cmdline_opts} ${custom_kopts} cdroot\"" >> ${iacfg} echo " initrd=/efi/boot/${x}.igz" >> ${iacfg} echo >> ${iacfg} echo "image=/efi/boot/${x}" >> ${iacfg} echo " label=${x}-serial">> ${iacfg} - echo " append='initrd=${x}.igz root=/dev/ram0 init=/linuxrc acpi=off ${cmdline_opts} ${custom_kopts} cdroot console=tty0 console=ttyS0,9600'" >> ${iacfg} + echo " append=\"initrd=${x}.igz root=/dev/ram0 init=/linuxrc acpi=off ${cmdline_opts} ${custom_kopts} cdroot console=tty0 console=ttyS0,9600\"" >> ${iacfg} echo " initrd=/efi/boot/${x}.igz" >> ${iacfg} echo >> ${iacfg} done |