From: Chris Gianelloni Date: Tue, 8 Apr 2008 00:56:04 +0000 (+0000) Subject: Check for a snapshot in the overlay and error if one is present. This should ensure... X-Git-Tag: CATALYST_2_0_6_916~104 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b02f66b9897d934ef86ddfa41150a0df73dadd7f;p=catalyst.git 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. 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 d4e42ec3..ab5145de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 08 Apr 2008; Chris Gianelloni + 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 catalyst, modules/catalyst_support.py: Added a small patch from Tim Yamin to fix make.conf diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh index 071635ff..43f5f0fb 100755 --- 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