From: Brad House <brad_mssw@gentoo.org>
Date: Thu, 15 Jan 2004 04:21:26 +0000 (+0000)
Subject: fixes
X-Git-Tag: CATALYST_1_0_1~75
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2db58d0ccd6a6d73d5d39bd827d27b0c320d4235;p=catalyst.git

fixes


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

diff --git a/examples/livecd/cdtar/isolinux-2.08-cdtar.tar.bz2 b/examples/livecd/cdtar/isolinux-2.08-cdtar.tar.bz2
index 681bdfe0..99c60412 100644
Binary files a/examples/livecd/cdtar/isolinux-2.08-cdtar.tar.bz2 and b/examples/livecd/cdtar/isolinux-2.08-cdtar.tar.bz2 differ
diff --git a/examples/livecd/runscript/x86-runscript.sh b/examples/livecd/runscript/x86-runscript.sh
index 0623cd01..59284b43 100644
--- a/examples/livecd/runscript/x86-runscript.sh
+++ b/examples/livecd/runscript/x86-runscript.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/examples/livecd/runscript/Attic/x86-runscript.sh,v 1.3 2004/01/15 03:21:04 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/examples/livecd/runscript/Attic/x86-runscript.sh,v 1.4 2004/01/15 04:21:26 brad_mssw Exp $
 
 # Section has been handled, do not execute additional scripts
 RETURN_GOOD=0
@@ -68,15 +68,16 @@ case $1 in
 			mv $clst_cdroot_path/isolinux/initrd $clst_cdroot_path/isolinux/$x.igz
 		done
 		icfg=$clst_cdroot_path/isolinux/isolinux.cfg
-		bmsg=$clst_cdroot_path/isolinux/boot.msg
+		kmsg=$clst_cdroot_path/isolinux/kernels.msg
 		hmsg=$clst_cdroot_path/isolinux/help.msg
 		echo "default $first" > $icfg
-		echo "timeout 60" >> $icfg
+		echo "timeout 150" >> $icfg
+		echo "prompt 1" >> $icfg
 		echo "display boot.msg" >> $icfg
-		echo "F1 boot.msg" >> $icfg
+		echo "F1 kernels.msg" >> $icfg
 		echo "F2 help.msg" >> $icfg
 
-		echo "Please choose an available boot kernel:" > $bmsg
+		echo "Available kernels:" > $kmsg
 		echo "TEST HELP MESSAGE" > $hmsg
 
 		for x in $clst_boot_kernel
@@ -86,12 +87,12 @@ case $1 in
 			echo "	kernel $x" >> $icfg
 			echo "	append initrd=$x.igz root=/dev/ram0 init=/linuxrc loop=/livecd.loop cdroot vga=0x317 splash=silent" >> $icfg
 			echo >> $icfg
-			echo "   $x" >> $bmsg
+			echo "   $x" >> $kmsg
 			echo "label $x-nofb" >> $icfg
 			echo "	kernel $x" >> $icfg
 			echo "	append initrd=$x.igz root=/dev/ram0 init=/linuxrc loop=/livecd.loop cdroot" >> $icfg
 			echo >> $icfg
-			echo "   ${x}-nofb" >> $bmsg
+			echo "   ${x}-nofb" >> $kmsg
 		done
 		exit $RETURN_CONTINUE
 	;;