added in memtest86 and fixed some bugs

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

diff --git a/ChangeLog b/ChangeLog
index 397729542d3e2ff38723538ba410f30f99db78bb..400026811a8d4954e2de8bc774ccb4f393bd37ed 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.26 2004/03/23 07:20:34 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.27 2004/03/25 00:03:27 zhen Exp $
+
+  24 Mar 2004; John Davis <zhen@gentoo.org> catalyst,
+  livecd/cdtar/isolinux-2.08-memtest86-cdtar.tar.bz2,
+  livecd/runscript/default-runscript.sh, livecd/runscript/x86-archscript.sh:
+  memtest is in. if you want to use it, check out the memtest86 cd tarball
+  Also, fixes for bugs 45078, 45188, 44306
 
   23 Mar 2004; John Davis <zhen@gentoo.org>
   livecd/runscript/alpha-archscript.sh, livecd/runscript/hppa-archscript.sh,

diff --git a/catalyst b/catalyst
index 4d39b4cf1f388e5a3478cd05401d68796010cf18..09989d0d255383aaaab4e2f30ce44323dc80db34 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.30 2004/03/05 06:24:17 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.31 2004/03/25 00:03:27 zhen Exp $
 
 import os,sys,imp,string
 
@@ -47,7 +47,7 @@ if os.path.exists(myconffile):
                sys.exit(1)
 
 confdefaults={ "storedir":"/var/tmp/catalyst","sharedir":"/usr/share/catalyst","distdir":"/usr/portage/distfiles",
-"portdir":"/usr/portage","options":"ccache"}
+"portdir":"/usr/portage","options":""}
 
 for x in confdefaults.keys():
        if myconf.has_key(x):
@@ -69,8 +69,9 @@ except ImportError:
 targetmap={}
 targets.register(targetmap)
 
-myspec["CCACHE"]="1"
-print "Compiler cache support enabled."
+if "ccache" in string.split(myspec["options"]):
+       print "Compiler cache support enabled."
+       myspec["CCACHE"]="1"
 
 if "pkgcache" in string.split(myspec["options"]):
        print "Package cache support enabled."

diff --git a/livecd/cdtar/isolinux-2.08-memtest86-cdtar.tar.bz2 b/livecd/cdtar/isolinux-2.08-memtest86-cdtar.tar.bz2
index e652fb84104a06f4e5c3e61f260e77c091d95b11..0bd0a6dfdaabbb9530054a2f313a8bdea60e8ed5 100644 (file)
Binary files a/livecd/cdtar/isolinux-2.08-memtest86-cdtar.tar.bz2 and b/livecd/cdtar/isolinux-2.08-memtest86-cdtar.tar.bz2 differ

diff --git a/livecd/runscript/default-runscript.sh b/livecd/runscript/default-runscript.sh
index 8f1af30a005cecc10c1eaa9681c02e2c71724ee9..959801cc287951513fb8659595cb200692969c33 100644 (file)
--- a/livecd/runscript/default-runscript.sh
+++ b/livecd/runscript/default-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/livecd/runscript/Attic/default-runscript.sh,v 1.2 2004/03/18 20:08:17 beejay Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/default-runscript.sh,v 1.3 2004/03/25 00:03:27 zhen Exp $
 
 #return codes to be used by archscript
 
@@ -87,7 +87,7 @@ create_gcloop()
 create_squashfs()
 {
        echo "Creating squashfs..."
-       mksquashfs -noappend "${clst_chroot_path}" "${clst_cdroot_path}/livecd.squashfs" || die "mksquashfs failed, did you emerge squashfs?"
+       mksquashfs "${clst_chroot_path}" "${clst_cdroot_path}/livecd.squashfs" -noappend || die "mksquashfs failed, did you emerge squashfs-utils?"
 }
 
 case $1 in
@@ -181,7 +181,7 @@ EOF
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/default-runscript.sh,v 1.2 2004/03/18 20:08:17 beejay Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/default-runscript.sh,v 1.3 2004/03/25 00:03:27 zhen Exp $
 
 depend() {
        after *
@@ -189,13 +189,13 @@ depend() {
 
 start() {
        ebegin "Auto-scrambling root password for security"
-       echo root:`pwgen -s 16` | chpasswd  > /dev/null 2>&1
-       eend $? "Failed to start local."
+       echo root:\`pwgen -s 16\` | chpasswd  > /dev/null 2>&1
+       eend \$? "Failed to start local."
 }
 
 stop() {
        ebegin "Stopping local"
-       eend $? "Failed to stop local."
+       eend \$? "Failed to stop local."
 }
 EOF
                

diff --git a/livecd/runscript/x86-archscript.sh b/livecd/runscript/x86-archscript.sh
index 94325bdcc416ed272a33e41f46c81be6e1f2667e..961a94bac8f9221817dc8ef0724ec1e17a982a11 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.2 2004/03/23 07:20:34 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/x86-archscript.sh,v 1.3 2004/03/25 00:03:27 zhen Exp $
 
 case $1 in
        kernel)
@@ -52,9 +52,9 @@ case $1 in
                echo "F2 help.msg" >> $icfg
 
                echo "Available kernels:" > $kmsg
-               cp examples/livecd/runscript/x86-help.msg $hmsg
+               cp ${clst_sharedir}/livecd/files/x86-help.msg $hmsg
 
-               for x in $clst_boot_kernel
+               for x in ${clst_boot_kernel}
                do
 
                        eval custom_kopts=\$${x}_kernelopts
@@ -71,8 +71,16 @@ case $1 in
                        echo >> $icfg
                        echo "   ${x}-nofb" >> $kmsg
                done
-       ;;
 
+               if [ -f ${clst_cdroot_path}/isolinux/memtest86 ]
+               then
+                       echo >> $icfg
+                       echo "   memtest86" >> $kmsg
+                       echo "label memtest86" >> $icfg
+                       echo "  kernel memtest86" >> $icfg
+               fi
+       ;;
+       
        cdfs)
        ;;