Let's automatically copy in the snapshot if livecd/type is gentoo-release-livecd.

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

diff --git a/ChangeLog b/ChangeLog
index 2f889e17be25613880ab9e96fabffdd1254f2999..771c302883afdd9beae89eeec8b4b61364756a64 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  27 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/livecd-stage2/livecd-stage2-controller.sh:
+  Let's automatically copy in the snapshot if livecd/type is
+  gentoo-release-livecd.
+
   26 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
   modules/generic_stage_target.py:
   Fix leading whitespace in empty() so it's only executed if there's something

diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index ca2bc1ceb970e8bc4af7d037e1123cc1225ec1c6..4bee86c85f06f03ab493580b937f21289a5c3b94 100755 (executable)
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -132,6 +132,12 @@ case $1 in
                        cp -f ${clst_sharedir}/livecd/files/Getting_Online.txt $1
                fi
 
+               if [ "${clst_livecd_type}" = "gentoo-release-livecd" ]
+               then
+                       mkdir -p $1/snapshots
+                       cp -f ${clst_snapshot_path}* $1/snapshots
+               fi
+
                ${clst_sharedir}/targets/support/bootloader-setup.sh $1
                ;;
     unmerge)