see changelog
authorJohn P. Davis <zhen@gentoo.org>
Wed, 12 May 2004 21:18:50 +0000 (21:18 +0000)
committerJohn P. Davis <zhen@gentoo.org>
Wed, 12 May 2004 21:18:50 +0000 (21:18 +0000)
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@368 d1e1f19c-881f-0410-ab34-b69fee027534

ChangeLog
livecd/runscript-support/kmerge.sh [new file with mode: 0755]
livecd/runscript-support/livecdfs-update.sh [new file with mode: 0755]
livecd/runscript-support/post-kmerge.sh [new file with mode: 0755]
livecd/runscript-support/pre-kmerge.sh [new file with mode: 0755]
livecd/runscript/default-runscript.sh
modules/catalyst_support.py
modules/targets.py

index f66ec6f739158e09404113fedeaf39e7566456cb..4ba4dc67a9fb7d32a44748be4627575dd54157dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,17 @@
 # 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.46 2004/05/02 10:20:27 tester Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.47 2004/05/12 21:18:50 zhen Exp $
+
+  12 May 2004; John Davis <zhen@gentoo.org>
+  livecd/runscript/default-runscript.sh, livecd/runscript-support/kmerge.sh,
+  livecd/runscript-support/livecdfs-update.sh,
+  livecd/runscript-support/post-kmerge.sh,
+  livecd/runscript-support/pre-kmerge.sh, modules/catalyst_support.py,
+  modules/targets.py:
+  fixed default-runscript.sh so that it is easier to read (no more chroot >> EOF
+  silliness). Most notably, I have taken advantage of the update-modules
+  --assume-kernel fix from agriffis so that we can actually use 3rd party
+  modules now. Please note that >=baselayout-1.9.0 is required.
 
   02 May 2004; Olivier Crete <tester@gentoo.org>
   arch/x86.py:
diff --git a/livecd/runscript-support/kmerge.sh b/livecd/runscript-support/kmerge.sh
new file mode 100755 (executable)
index 0000000..702fabe
--- /dev/null
@@ -0,0 +1,69 @@
+#!/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.1 2004/05/12 21:18:50 zhen Exp $
+
+die() {
+       echo "$1"
+       exit 1
+}
+
+# Script to build each kernel, kernel-related packages
+/usr/sbin/env-update
+source /etc/profile
+
+[ -n "${clst_ENVSCRIPT}" ] && source /tmp/envscript
+export CONFIG_PROTECT="-*"
+rm -f /usr/src/linux
+
+#set the timezone for the kernel build
+rm /etc/localtime
+ln -s /usr/share/zoneinfo/UTC /etc/localtime
+
+[ -e /var/tmp/${clst_kname}.use ] && export USE="$( cat /var/tmp/${clst_kname}.use )" || unset USE
+# Don't use pkgcache here, as the kernel source may get emerge with different USE variables
+# (and thus different patches enabled/disabled.) Also, there's no real benefit in using the
+# pkgcache for kernel source ebuilds.
+       
+emerge ${clst_ksource} || exit 1
+[ ! -e /usr/src/linux ] && die "Can't find required directory /usr/src/linux"
+       
+#if catalyst has set NULL_VALUE, extraversion wasn't specified so we skip this part
+if [ "${clst_kextversion}" != "NULL_VALUE" ]
+then
+       sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextversion}:" /usr/src/linux/Makefile
+fi
+       
+if [ -n "${clst_CCACHE}" ]
+then
+       #enable ccache for genkernel
+       export PATH="/usr/lib/ccache/bin:${PATH}"
+fi
+
+# grep out the kernel version so that we can do our modules magic
+VER=`grep ^VERSION\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
+PAT=`grep ^PATCHLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
+SUB=`grep ^SUBLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
+EXV=`grep ^EXTRAVERSION\ \= /usr/src/linux/Makefile | sed -e "s/EXTRAVERSION =//" -e "s/ //g"`
+clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV}
+
+genkernel ${genkernel_args} --kerneldir=/usr/src/linux --kernel-config=/var/tmp/${clst_kname}.config --minkernpackage=/tmp/binaries/${clst_kname}.tar.bz2 all || exit 1
+       
+#now we merge any kernel-dependent packages
+if [ -e /var/tmp/${clst_kname}.packages ]
+then
+       for x in $( cat /var/tmp/${clst_kname}.packages )
+       do
+               # we don't want to use the pkgcache for these since the results
+               # are kernel-dependent.
+               emerge "$x"
+               /sbin/modules-update --assume-kernel=${clst_fudgeuname}
+       done
+fi
+
+/sbin/modules-update --assume-kernel=${clst_fudgeuname}
+               
+#now the unmerge... (wipe db entry)
+emerge -C ${clst_ksource}
+unset USE
+
diff --git a/livecd/runscript-support/livecdfs-update.sh b/livecd/runscript-support/livecdfs-update.sh
new file mode 100755 (executable)
index 0000000..13b4b9b
--- /dev/null
@@ -0,0 +1,51 @@
+#!/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.1 2004/05/12 21:18:50 zhen Exp $
+
+/usr/sbin/env-update
+source /etc/profile
+
+if [ -e /etc/sshd/sshd_config ]
+then
+       #allow root logins to the livecd by default
+       sed -e "s/^#PermitRootLogin\ yes/PermitRootLogin\ yes/" /etc/ssh/sshd_config > /etc/ssh/sshd_config1
+       mv /etc/ssh/sshd_config1 /etc/ssh/sshd_config
+fi
+
+# fix /etc/issue for mingetty and friends
+echo "This is \n.gentoo (\s \m \r) \t" > /etc/issue
+               
+rc-update del iptables default
+rc-update del netmount default
+#rc-update add hotplug default
+#rc-update add kudzu default
+rc-update add autoconfig default
+rc-update del keymaps
+rc-update del consolefont
+rc-update add metalog default
+rc-update add modules default
+[ -e /etc/init.d/bootsplash ] && rc-update add bootsplash default
+
+rm -rf /etc/localtime
+cp /usr/share/zoneinfo/GMT /etc/localtime
+echo "livecd" > /etc/hostname
+
+sed -i -e '/\/dev\/[RBS]*/ s/^/#/' /etc/fstab
+echo "tmpfs            /       tmpfs   defaults        0 0" >> /etc/fstab
+sed -i -e '/dev-state/ s/^/#/' /etc/devfsd.conf
+
+echo "alias cp='cp -i'" >> /etc/profile
+echo "alias ls='ls --color'" >> /etc/profile
+echo "alias mv='mv -i'" >> /etc/profile
+echo "alias pico='nano -w'" >> /etc/profile
+echo "alias rm='rm -i'" >> /etc/profile
+
+# make sure we have the latest pci and hotplug ids
+if [ -d /usr/share/hwdata ]
+then
+       rm -f /usr/share/hwdata/pci.ids
+       rm -f /usr/share/hwdata/usb.ids
+       ln -s /usr/share/misc/pci.ids /usr/share/hwdata/pci.ids
+       ln -s /usr/share/misc/usb.ids /usr/share/hwdata/usb.ids
+fi
diff --git a/livecd/runscript-support/post-kmerge.sh b/livecd/runscript-support/post-kmerge.sh
new file mode 100755 (executable)
index 0000000..22d28f5
--- /dev/null
@@ -0,0 +1,12 @@
+#!/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/post-kmerge.sh,v 1.1 2004/05/12 21:18:50 zhen Exp $
+
+/usr/sbin/env-update
+source /etc/profile
+
+emerge -C genkernel
+
+/sbin/depscan.sh
+find /lib/modules -name modules.dep -exec touch {} \;
diff --git a/livecd/runscript-support/pre-kmerge.sh b/livecd/runscript-support/pre-kmerge.sh
new file mode 100755 (executable)
index 0000000..946d392
--- /dev/null
@@ -0,0 +1,11 @@
+#!/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/pre-kmerge.sh,v 1.1 2004/05/12 21:18:50 zhen Exp $
+
+/usr/sbin/env-update
+source /etc/profile
+
+emerge genkernel
+install -d /tmp/binaries
+rm -f /usr/src/linux
index ed9199a6426554ca0684af61e48f76a67e0d46d8..875e7cd8f79fa878518a01e19322765f72bf52cf 100644 (file)
 # 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.8 2004/04/26 15:18:55 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/default-runscript.sh,v 1.9 2004/05/12 21:18:50 zhen Exp $
 
 #return codes to be used by archscript
-
 die() {
        echo "$1"
        exit 1
 }
 
-case $clst_livecd_cdfstype in
-zisofs)
-       cmdline_opts="looptype=zisofs loop=/zisofs"
-       ;;
-normal)
-       cmdline_opts="looptype=normal loop=/livecd.loop"
-       ;;
-noloop)
-       cmdline_opts="looptype=noloop"
-       ;;
-squashfs)
-       cmdline_opts="looptype=squashfs loop=/livecd.squashfs"
-       ;;
-gcloop)
-       cmdline_opts="looptype=gcloop loop=/livecd.gcloop"
-       ;;
+case ${clst_livecd_cdfstype} in
+       zisofs)
+               cmdline_opts="looptype=zisofs loop=/zisofs"
+               ;;
+       normal)
+               cmdline_opts="looptype=normal loop=/livecd.loop"
+               ;;
+       noloop)
+               cmdline_opts="looptype=noloop"
+               ;;
+       squashfs)
+               cmdline_opts="looptype=squashfs loop=/livecd.squashfs"
+               ;;
+       gcloop)
+               cmdline_opts="looptype=gcloop loop=/livecd.gcloop"
+               ;;
 esac
 
 source ${clst_livecd_archscript}
 
-create_normal_loop()
-{
+create_normal_loop() {
+
                #We get genkernel-built kernels and initrds in place, create the loopback fs on 
                #$clst_cdroot_path, mount it, copy our bootable filesystem over, umount it, and 
                #we then have a ready-to-burn ISO tree at $clst_cdroot_path.
 
                echo "Calculating size of loopback filesystem..."
-               loopsize=`du -ks $clst_chroot_path | cut -f1`
-               [ "$loopsize" = "0" ] && loopsize=1
-               #increase the size by 1/3, then divide by 4 to get 4k blocks
-#              loopsize=$(( ( $loopsize + ( $loopsize / 2 ) ) / 4  ))
+               loopsize=`du -ks ${clst_chroot_path} | cut -f1`
+               [ "${loopsize}" = "0" ] && loopsize=1
                # Add 4MB for filesystem slop
-               loopsize=`expr $loopsize + 4096`
+               loopsize=`expr ${loopsize} + 4096`
                echo "Creating loopback file..."
-               dd if=/dev/zero of=$clst_cdroot_path/livecd.loop bs=1k count=$loopsize || die "livecd.loop creation failure"
-               #echo "Calculating number of inodes required for ext2 filesystem..."
-               #numnodes=`find $clst_chroot_path | wc -l`
-               #numnodes=$(( $numnodes + 200 ))
-               mke2fs -m 0 -F -q $clst_cdroot_path/livecd.loop || die "Couldn't create ext2 filesystem"
-#              mke2fs -m 0 -F -b 4096 -q $clst_cdroot_path/livecd.loop || die "Couldn't create ext2 filesystem"
-               install -d $clst_cdroot_path/loopmount
+               dd if=/dev/zero of=${clst_cdroot_path}/livecd.loop bs=1k count=${loopsize} || die "livecd.loop creation failure"
+               mke2fs -m 0 -F -q ${clst_cdroot_path}/livecd.loop || die "Couldn't create ext2 filesystem"
+               install -d ${clst_cdroot_path}/loopmount
                sync; sync; sleep 3 #try to work around 2.6.0+ loopback bug
-               mount -t ext2 -o loop $clst_cdroot_path/livecd.loop $clst_cdroot_path/loopmount || die "Couldn't mount loopback ext2 filesystem"
+               mount -t ext2 -o loop ${clst_cdroot_path}/livecd.loop ${clst_cdroot_path}/loopmount || die "Couldn't mount loopback ext2 filesystem"
                sync; sync; sleep 3 #try to work around 2.6.0+ loopback bug
-               echo "cp -a $clst_chroot_path/* $clst_cdroot_path/loopmount"
-               cp -a $clst_chroot_path/* $clst_cdroot_path/loopmount 
+               echo "cp -a ${clst_chroot_path}/* ${clst_cdroot_path}/loopmount"
+               cp -a ${clst_chroot_path}/* ${clst_cdroot_path}/loopmount 
 
-               [ $? -ne 0 ] && { umount $clst_cdroot_path/loopmount; die "Couldn't copy files to loopback ext2 filesystem"; }
-               umount $clst_cdroot_path/loopmount || die "Couldn't unmount loopback ext2 filesystem"
-               rm -rf $clst_cdroot_path/loopmount
+               [ $? -ne 0 ] && { umount ${clst_cdroot_path}/loopmount; die "Couldn't copy files to loopback ext2 filesystem"; }
+               umount ${clst_cdroot_path}/loopmount || die "Couldn't unmount loopback ext2 filesystem"
+               rm -rf ${clst_cdroot_path}/loopmount
                #now, $clst_cdroot_path should contain a proper bootable image for our iso, including
                #boot loader and loopback filesystem.
 }
 
-create_zisofs()
-{
+create_zisofs() {
+
        rm -rf "${clst_cdroot_path}/zisofs" > /dev/null 2>&1
        echo "Creating zisofs..."
        mkzftree -z 9 -p2 "${clst_chroot_path}" "${clst_cdroot_path}/zisofs" || die "Could not run mkzftree, did you emerge zisofs"
+
 }
 
-create_noloop()
-{
+create_noloop() {
+
        echo "Copying files for image (no loop)..."
        cp -a "${clst_chroot_path}"/* "${clst_cdroot_path}" || die "Could not copy files to image (no loop)"
+       
 }
 
-create_gcloop()
-{
+create_gcloop() {
        create_normal_loop
        compress_gcloop_ucl -b 131072 -c 10 "${clst_cdroot_path}/livecd.loop" "${clst_cdroot_path}/livecd.gcloop" || die "compress_gcloop_ucl failed, did you emerge gcloop?"
        rm -f "${clst_cdroot_path}/livecd.loop"
        # only a gcloop image should exist in cdroot path
+       
 }
 
-create_squashfs()
-{
+create_squashfs() {
        echo "Creating squashfs..."
        mksquashfs "${clst_chroot_path}" "${clst_cdroot_path}/livecd.squashfs" -noappend || die "mksquashfs failed, did you emerge squashfs-utils?"
+       
 }
 
+## START RUNSCRIPT
+
 case $1 in
        kernel)
                shift
                numkernels="$1"
                shift
-               $clst_CHROOT $clst_chroot_path /bin/bash << EOF
-               env-update
-               source /etc/profile
-               export CONFIG_PROTECT="-*"
-               [ -n "${clst_ENVSCRIPT}" ] && source /tmp/envscript
-               emerge genkernel
-               install -d /tmp/binaries
-EOF
-       [ $? -ne 0 ] && exit 1
+               
+               # setup genkernel and do any pre-kernel merge opts
+               cp -a ${clst_sharedir}/livecd/runscript-support/pre-kmerge.sh ${clst_chroot_path}/tmp
+               ${clst_CHROOT} ${clst_chroot_path} /tmp/pre-kmerge.sh || exit 1
+               rm -f ${clst_chroot_path}/tmp/pre-kmerge.sh
+
+               # the kernel merge process is done in a chroot
+               cp -a ${clst_sharedir}/livecd/runscript-support/kmerge.sh ${clst_chroot_path}/tmp
                count=0
-               while [ $count -lt $numkernels ]
+               while [ ${count} -lt ${numkernels} ]
                do
-                       clst_kname="$1"
+                       export clst_kname="$1"
                        shift
-                       clst_ksource="$1"
+                       export clst_ksource="$1"
                        shift
-                       clst_kextversion="$1"
+                       export clst_kextversion="$1"
                        shift
-                       $clst_CHROOT $clst_chroot_path /bin/bash << EOF
-                               die() {
-                                       echo "$1"
-                                       exit 1
-                               }
-                               # Script to build each kernel, kernel-related packages 
-                               source /etc/profile
-                               [ -n "${clst_ENVSCRIPT}" ] && source /tmp/envscript
-                               rm -f /usr/src/linux
-                               
-                               #set the timezone for the kernel build
-                               rm /etc/localtime
-                               ln -s /usr/share/zoneinfo/UTC /etc/localtime
-
-                               [ -e /var/tmp/$clst_kname.use ] && export USE="\$( cat /var/tmp/$clst_kname.use )" || unset USE
-                               # Don't use pkgcache here, as the kernel source may get emerge with different USE variables
-                               # (and thus different patches enabled/disabled.) Also, there's no real benefit in using the
-                               # pkgcache for kernel source ebuilds.
-                               emerge $clst_ksource || exit 1
-                               [ ! -e /usr/src/linux ] && die "Can't find required directory /usr/src/linux"
-                               #if catalyst has set NULL_VALUE, extraversion wasn't specified so we skip this part
-                               if [ "$clst_kextversion" != "NULL_VALUE" ]
-                               then
-                                       # Append Extraversion
-                                       sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextversion}:" /usr/src/linux/Makefile
-                               fi
-                               if [ -n "${clst_CCACHE}" ]
-                               then
-                                       #enable ccache for genkernel
-                                       export PATH="/usr/lib/ccache/bin:\${PATH}"
-                               fi
-                               genkernel ${genkernel_args} --kerneldir=/usr/src/linux --kernel-config=/var/tmp/$clst_kname.config --minkernpackage=/tmp/binaries/$clst_kname.tar.bz2 all || exit 1
-                               #now we merge any kernel-dependent packages
-                               if [ -e /var/tmp/$clst_kname.packages ]
-                               then
-                                       for x in \$( cat /var/tmp/$clst_kname.packages )
-                                       do
-                                               # we don't want to use the pkgcache for these since the results
-                                               # are kernel-dependent.
-                                               echo DEBUG emerge "\$x"
-                                               emerge "\$x"
-                                               update-modules
-                                       done
-                               fi
-
-                               #fix to get modprobe.conf
-                               ln -s /lib/modules/\`sed -n '1s/.* //;1s/"//g; 1p' /usr/src/linux/include/linux/version.h\` /lib/modules/`uname -r`
-                               /sbin/modules-update
-                               rm `uname -r`
-
-                               cd /usr/src
-                               rm -rf linux*
-                               #now the unmerge... (wipe db entry)
-                               emerge -C $clst_ksource
-                               unset USE
-EOF
-                       [ $? -ne 0 ] && exit 1 
-                       count=$(( $count + 1 ))
+               ${clst_CHROOT} ${clst_chroot_path} /tmp/kmerge.sh || exit 1
+               count=$(( ${count} + 1 ))
                done
-               $clst_CHROOT $clst_chroot_path /bin/bash << EOF
-                       #cleanup steps
-                       source /etc/profile
-                       emerge -C genkernel 
-                       /sbin/depscan.sh
-                       find /lib/modules -name modules.dep -exec touch {} \;
-EOF
-       [ $? -ne 0 ] && exit 1
-       ;;
+               rm -f ${clst_chroot_path}/tmp/kmerge.sh
+       
+               # clean up genkernel and do any post-kernel merge opts
+               cp -a ${clst_sharedir}/livecd/runscript-support/post-kmerge.sh ${clst_chroot_path}/tmp
+               ${clst_CHROOT} ${clst_chroot_path} /tmp/post-kmerge.sh || exit 1
+               rm -f ${clst_chroot_path}/tmp/post-kmerge.sh
+               ;;
 
        preclean)
-               cat > $clst_chroot_path/etc/init.d/local << 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.8 2004/04/26 15:18:55 zhen Exp $
-
-depend() {
-       after *
-}
-
-start() {
-       ebegin "Auto-scrambling root password for security"
-       echo root:\`pwgen -s 16\` | chpasswd  > /dev/null 2>&1
-       eend \$? "Failed to start local."
-}
-
-stop() {
-       ebegin "Stopping local"
-       eend \$? "Failed to stop local."
-}
-EOF
-               
-               $clst_CHROOT $clst_chroot_path /bin/bash << EOF
-                       # SCRIPT TO UPDATE FILESYSTEM SPECIFIC FOR LIVECD. THIS GETS EXECUTED IN CHROOT
-                       env-update
-                       source /etc/profile
-                       if [ -e /etc/sshd/sshd_config ]
-                               then
-                                       #allow root logins to the livecd by default
-                                       sed -e "s/^#PermitRootLogin\ yes/PermitRootLogin\ yes/" /etc/ssh/sshd_config > /etc/ssh/sshd_config1
-                                       mv /etc/ssh/sshd_config1 /etc/ssh/sshd_config
-                       fi
-                       # fix /etc/issue for mingetty and friends
-                       echo "This is \n.gentoo (\s \m \r) \t" > /etc/issue
-               
-                       rc-update del iptables default
-                       rc-update del netmount default
-#                      rc-update add hotplug default
-#                      rc-update add kudzu default
-                       rc-update add autoconfig default
-                       rc-update del keymaps
-                       rc-update del consolefont
-                       rc-update add metalog default
-                       rc-update add modules default
-                       [ -e /etc/init.d/bootsplash ] && rc-update add bootsplash default
-                       rm -rf /etc/localtime
-                       cp /usr/share/zoneinfo/GMT /etc/localtime
-                       echo "livecd" > /etc/hostname
-                       sed -i -e '/\/dev\/[RBS]*/ s/^/#/' /etc/fstab
-                       echo "tmpfs             /       tmpfs   defaults        0 0" >> /etc/fstab
-                       sed -i -e '/dev-state/ s/^/#/' /etc/devfsd.conf
-
-                       echo "alias cp='cp -i'" >> /etc/profile
-                       echo "alias ls='ls --color'" >> /etc/profile
-                       echo "alias mv='mv -i'" >> /etc/profile
-                       echo "alias pico='nano -w'" >> /etc/profile
-                       echo "alias rm='rm -i'" >> /etc/profile
-                       # END OF SCRIPT TO UPDATE FILESYSTEM
-EOF
-               [ $? -ne 0 ] && exit 1 
-       ;;
+               # overwrite /etc/init.d/local in the livecd root
+               rm -f ${clst_chroot_path}/etc/init.d/local
+               cp -a ${clst_sharedir}/livecd/files/livecd-rclocal ${clst_chroot_path}/etc/init.d/local
+       
+               # now, finalize and tweak the livecd fs
+               cp ${clst_sharedir}/livecd/runscript-support/livecdfs-update.sh ${clst_chroot_path}/tmp
+               ${clst_CHROOT} ${clst_chroot_path} /tmp/livecdfs-update.sh || exit 1
+               rm -f ${clst_chroot_path}/tmp/livecdfs-update.sh
+               ;;
 
        clean)
-               find $clst_chroot_path/usr/lib -iname "*.pyc" -exec rm -f {} \;
+               find ${clst_chroot_path}/usr/lib -iname "*.pyc" -exec rm -f {} \;
        ;;
 
        bootloader)
@@ -276,9 +162,9 @@ EOF
                        loopret=$?
                fi              
                exit $loopret
-       ;;
+               ;;
 
        iso)
-       ;;
+               ;;
 esac
 exit 0 
index 5bf5ac207f21f8fd1e5aa36d4c9265a57f64245a..6bed7bac64a27c7f6604f4821bb55bd92aafd2b0 100644 (file)
@@ -1,6 +1,6 @@
 # Distributed under the GNU General Public License version 2
 # Copyright 2003-2004 Gentoo Technologies, Inc.
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/catalyst_support.py,v 1.18 2004/04/12 14:38:26 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/catalyst_support.py,v 1.19 2004/05/12 21:18:50 zhen Exp $
 
 import sys,string,os,types
 
@@ -33,6 +33,7 @@ class CatalystError(Exception):
                if message:
                        print
                        print "catalyst: "+message
+                       
 def die(msg=None):
        warn(msg)
        sys.exit(1)
index 1a9dec422d51cd6e387318537f5c138a7dbc2950..cea02b7ee20cb3ac9b0dbb627c3a49ef2e651646 100644 (file)
@@ -1,6 +1,6 @@
 # Distributed under the GNU General Public License version 2
 # Copyright 2003-2004 Gentoo Technologies, Inc.
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/targets.py,v 1.102 2004/05/06 23:06:17 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/targets.py,v 1.103 2004/05/12 21:18:50 zhen Exp $
 
 import os,string,imp,types,shutil
 from catalyst_support import *
@@ -556,7 +556,6 @@ class livecd_stage2_target(generic_stage_target):
                        #write out /var/tmp/kname.(use|packages) files, used for kernel USE and extra packages settings
                        for extra in ["use","packages"]:
                                if self.settings.has_key("boot/kernel/"+kname+"/"+extra):
-                                       print "DEBUG: has key boot/kernel/"+kname+"/"+extra,self.settings["boot/kernel/"+kname+"/"+extra]
                                        myex=self.settings["boot/kernel/"+kname+"/"+extra]
                                        if type(myex)==types.ListType:
                                                myex=string.join(myex)
@@ -570,10 +569,7 @@ class livecd_stage2_target(generic_stage_target):
                                        else:
                                                myf.write(myex+"\n")
                                        myf.close()
-                               else:
-                                       print "DEBUG: no key boot/kernel/"+kname+"/"+extra
                                        
-
                        retval=os.system("cp "+self.settings["boot/kernel/"+kname+"/config"]+" "+self.settings["chroot_path"]+"/var/tmp/"+kname+".config")
                        if retval!=0:
                                self.unbind()