From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Sun, 13 Apr 2008 21:55:03 +0000 (+0000)
Subject: Added initial framework for creating the CD's root on livecd/livedvd.  Currently... 
X-Git-Tag: CATALYST_2_0_6_916~99
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7535b107fa756d42fc976a76147fac5a8dad2279;p=catalyst.git

Added initial framework for creating the CD's root on livecd/livedvd.  Currently, the end result is the same, but I'll be adding code to automatically copy the stages and to automatically download the distfiles.

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

diff --git a/ChangeLog b/ChangeLog
index bfc0bdae..ba391f22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  13 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/livecd-stage2/livecd-stage2-controller.sh:
+  Added initial framework for creating the CD's root on livecd/livedvd.
+  Currently, the end result is the same, but I'll be adding code to
+  automatically copy the stages and to automatically download the distfiles.
+
   13 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/livecd-stage2/livecd-stage2-controller.sh,
   targets/support/kmerge.sh, targets/support/livecdfs-update.sh,
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index e34ffdb9..0b15c599 100755
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -142,7 +142,7 @@ case $1 in
 		esac
 
 		case ${clst_livecd_type} in
-			gentoo-release-live*)
+			gentoo-release-livecd)
 				mkdir -p $1/snapshots
 				if [ -n "${clst_livecd_overlay}" ]
 				then
@@ -156,6 +156,37 @@ case $1 in
 				cp -f ${clst_snapshot_path} $1/snapshots
 				cp -f ${clst_snapshot_path}.DIGESTS $1/snapshots
 			;;
+			gentoo-release-livedvd)
+				targets="distfiles snapshots stages"
+				for i in ${targets}
+				do
+					mkdir -p $1/$i
+					if [ -n "${clst_livecd_overlay}" ]
+					then
+						if [ -e ${clst_livecd_overlay}/$i ] && \
+						[ -n "$(ls ${clst_livecd_overlay}/$i |grep -v README)" ]
+						then
+							echo "ERROR: You have files in $i in your overlay!"
+							echo "This directory is now populated by catalyst."
+							exit 1
+						fi
+					fi
+					case ${target} in
+						distfiles)
+							### TODO: make this fetch the distfiles
+							continue
+						;;
+						snapshots)
+							cp -f ${clst_snapshot_path} $1/snapshots
+							cp -f ${clst_snapshot_path}.DIGESTS $1/snapshots
+						;;
+						stages)
+							### TODO: make this copy stages
+							continue
+						;;
+					esac
+				done
+			;;
 		esac
 
 		${clst_sharedir}/targets/support/bootloader-setup.sh $1