From: Eric Edgar Date: Tue, 9 Aug 2005 21:44:45 +0000 (+0000) Subject: fix bug in exec_in_chroot for stage1 target X-Git-Tag: CATALYST_2_0_6_916~671 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=43c0b940543fff0f261d2a5142a479f1b8b157d4;p=catalyst.git fix bug in exec_in_chroot for stage1 target git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@823 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index bafbfc32..107ae587 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.315 2005/08/09 19:25:08 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.316 2005/08/09 21:44:45 rocket Exp $ + + 09 Aug 2005; Eric Edgar + modules/generic_stage_target.py, targets/support/functions.sh: + fix bug in exec_in_chroot for stage1 target 09 Aug 2005; Eric Edgar modules/catalyst_support.py, modules/generic_stage_target.py: diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index efc7a763..bc876948 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.55 2005/08/09 19:25:08 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.56 2005/08/09 21:44:45 rocket Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -496,7 +496,7 @@ class generic_stage_target(generic_target): self.mount_safety_check() if invalid_snapshot: - print "InValid Resume point detected, cleaning up ..." + print "No Valid Resume point detected, cleaning up ..." #os.remove(self.settings["autoresume_path"]+"dir_setup") self.clear_autoresume() self.clear_chroot() diff --git a/targets/support/functions.sh b/targets/support/functions.sh index df57aa95..acbc9373 100755 --- a/targets/support/functions.sh +++ b/targets/support/functions.sh @@ -40,13 +40,13 @@ exec_in_chroot(){ chroot_path=${clst_chroot_path}${subdir} copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh ${subdir}/tmp/ echo "Running ${file_name} in chroot ${chroot_path}" - ${clst_CHROOT} ${chroot_path} ${subdir}/tmp/${file_name} || exit 1 + ${clst_CHROOT} ${chroot_path} /tmp/${file_name} || exit 1 else copy_to_chroot ${1} tmp/ chroot_path=${clst_chroot_path} copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh tmp/ echo "Running ${file_name} in chroot ${chroot_path}" - ${clst_CHROOT} ${chroot_path}/ tmp/${file_name} || exit 1 + ${clst_CHROOT} ${chroot_path}/ /tmp/${file_name} || exit 1 fi rm -f ${chroot_path}/tmp/${file_name}