Check for a snapshot in the overlay and error if one is present. This should ensure...

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

diff --git a/ChangeLog b/ChangeLog
index d4e42ec3136e25076488c39611d867fbe58e5503..ab5145de7a10bbb9908b417a0f043e344a52798a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  08 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/livecd-stage2/livecd-stage2-controller.sh:
+  Check for a snapshot in the overlay and error if one is present. This should
+  ensure that the snapshot on the CD is the same as the one used to build the
+  ISO.
+
   06 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   modules/catalyst_support.py:
   Added a small patch from Tim Yamin <tim.yamin@zonbu.com> to fix make.conf

diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index 071635ffe534228ebdc9ef838731d9ac706835af..43f5f0fb574d3203f35355e78ad1f1a0e7597b22 100755 (executable)
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -142,6 +142,15 @@ case $1 in
                if [ "${clst_livecd_type}" = "gentoo-release-livecd" ]
                then
                        mkdir -p $1/snapshots
+                       if [ -n "${clst_livecd_overlay}" ]
+                       then
+                               if [ -e ${clst_livecd_overlay}/snapshots/${clst_snapshot_path} ]
+                               then
+                                       echo "ERROR: You have a snapshot in your overlay, please"
+                                       echo "remove it, since catalyst adds it automatically."
+                                       exit 1
+                               fi
+                       fi
                        cp -f ${clst_snapshot_path} $1/snapshots
                        cp -f ${clst_snapshot_path}.DIGESTS $1/snapshots
                fi