new genkernel fixups

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@393 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 09eb6e9dfe10c4e187206bf386517c074e4d1f21..e6db652fc398a50ae9a9c402719199711e19b772 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.63 2004/06/13 15:18:49 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.64 2004/06/13 15:48:51 zhen Exp $
+
+  13 Jun 2004; John Davis <zhen@gentoo.org>
+  livecd/runscript/x86-archscript.sh, livecd/runscript-support/kmerge.sh,
+  livecd/runscript-support/livecdfs-update.sh:
+  some last minute fixins
+  (stuff to work with the new genkernel)
 
   13 Jun 2004; John Davis <zhen@gentoo.org> catalyst:
   rolling out 1.0.8.1

diff --git a/livecd/runscript-support/kmerge.sh b/livecd/runscript-support/kmerge.sh
index b71647cc31fc59c41e15fa370554a6a4db5a0d7d..d283cd2a53f2e10eaa44b86b4db096a6b6bb406f 100755 (executable)
--- a/livecd/runscript-support/kmerge.sh
+++ b/livecd/runscript-support/kmerge.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/kmerge.sh,v 1.6 2004/06/10 15:55:11 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/kmerge.sh,v 1.7 2004/06/13 15:48:51 zhen Exp $
 
 die() {
        echo "$1"
@@ -50,7 +50,7 @@ clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV}
 
 if [ -n "${clst_livecd_bootsplash}" ]
 then
-       BOOTSPLASH_THEME="${clst_livecd_bootsplash}" genkernel ${clst_livecd_gk_mainargs} ${clst_livecd_gk_kernargs} --kerneldir=/usr/src/linux --kernel-config=/var/tmp/${clst_kname}.config --minkernpackage=/tmp/binaries/${clst_kname}.tar.bz2 all || exit 1
+       genkernel --bootsplash=${clst_livecd_bootsplash} ${clst_livecd_gk_mainargs} ${clst_livecd_gk_kernargs} --kerneldir=/usr/src/linux --kernel-config=/var/tmp/${clst_kname}.config --minkernpackage=/tmp/binaries/${clst_kname}.tar.bz2 all || exit 1
 else
        genkernel ${clst_livecd_gk_mainargs} ${clst_livecd_gk_kernargs} --kerneldir=/usr/src/linux --kernel-config=/var/tmp/${clst_kname}.config --minkernpackage=/tmp/binaries/${clst_kname}.tar.bz2 all || exit 1
 fi

diff --git a/livecd/runscript-support/livecdfs-update.sh b/livecd/runscript-support/livecdfs-update.sh
index 08147ab9b432dbf5b0f35c35d8992cad68d52a5c..04147d644e608f0ce62f596d1242d531db930486 100755 (executable)
--- a/livecd/runscript-support/livecdfs-update.sh
+++ b/livecd/runscript-support/livecdfs-update.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.5 2004/06/10 15:55:11 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.6 2004/06/13 15:48:51 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -87,7 +87,7 @@ if [ -n "${clst_livecd_bootsplash}" ]
 then
        if [ -d "/etc/bootsplash/${clst_livecd_bootsplash}" ]
        then
-               sed -i 's/BOOTSPLASH_THEME=\"gentoo\"/\"${clst_livecd_bootsplash}\"/' /etc/conf.d/bootsplash
+               sed -i 's/BOOTSPLASH_THEME=\"gentoo\"/BOOTSPLASH_THEME=\"${clst_livecd_bootsplash}\"/' /etc/conf.d/bootsplash
                rm /etc/bootsplash/default
                ln -s "/etc/bootsplash/${clst_livecd_bootsplash}" /etc/bootsplash/default
        else

diff --git a/livecd/runscript/x86-archscript.sh b/livecd/runscript/x86-archscript.sh
index 9c0577b019e10105f75193f1c809aafe33c64b69..810e4b3892b41c65b6d6bea135471e2b3e9a3919 100644 (file)
--- a/livecd/runscript/x86-archscript.sh
+++ b/livecd/runscript/x86-archscript.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/x86-archscript.sh,v 1.7 2004/05/19 12:40:03 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/x86-archscript.sh,v 1.8 2004/06/13 15:48:51 zhen Exp $
 
 case $1 in
        kernel)
@@ -35,9 +35,9 @@ case $1 in
                        [ ! -e "$clst_chroot_path/tmp/binaries/$x.tar.bz2" ] && die "Can't find kernel tarball at $clst_chroot_path/tmp/binaries/$x.tar.bz2"
                        tar xjvf $clst_chroot_path/tmp/binaries/$x.tar.bz2 -C $clst_cdroot_path/isolinux
                        #change kernel name from "kernel" to "gentoo", for example
-                       mv $clst_cdroot_path/isolinux/kernel $clst_cdroot_path/isolinux/$x
+                       mv $clst_cdroot_path/isolinux/kernel* $clst_cdroot_path/isolinux/$x
                        #change initrd name from "initrd" to "gentoo.igz", for example
-                       mv $clst_cdroot_path/isolinux/initrd $clst_cdroot_path/isolinux/$x.igz
+                       mv $clst_cdroot_path/isolinux/initrd* $clst_cdroot_path/isolinux/$x.igz
                done
                icfg=$clst_cdroot_path/isolinux/isolinux.cfg
                kmsg=$clst_cdroot_path/isolinux/kernels.msg