From 40e6acd7d27f6101e0bf3a5a96d7695bdd3804d3 Mon Sep 17 00:00:00 2001 From: "John P. Davis" Date: Mon, 10 Jan 2005 01:05:59 +0000 Subject: [PATCH] fix for bug #76146 git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@512 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 +++++- modules/generic_stage_target.py | 4 ++-- modules/livecd_stage2_target.py | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3607e6e6..75f4c129 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.139 2005/01/05 20:18:05 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.140 2005/01/10 01:05:59 zhen Exp $ + + 09 Jan 2005; John Davis modules/generic_stage_target.py, + modules/livecd_stage2_target.py: + fix for bug #76146 05 Jan 2005; Chris Gianelloni livecd/runscript-support/livecdfs-update.sh, targets/stage1/stage1.sh: diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index ed3cc393..7d1ebbba 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2004 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.22 2005/01/04 23:54:59 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.23 2005/01/10 01:05:59 zhen Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -245,7 +245,7 @@ class generic_stage_target(generic_target): if self.settings.has_key("portage_confdir"): print "Configuring /etc/portage..." cmd("rm -rf "+self.settings["chroot_path"]+"/etc/portage","Error zapping /etc/portage") - cmd("cp -R "+self.settings["portage_confdir"]+" "+self.settings["chroot_path"]+\ + cmd("cp -R "+self.settings["portage_confdir"]+"/ "+self.settings["chroot_path"]+\ "/etc/portage","Error copying /etc/portage") for x in self.mounts: diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py index 1ab89736..5c1ac3bc 100644 --- a/modules/livecd_stage2_target.py +++ b/modules/livecd_stage2_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.28 2005/01/04 23:54:59 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.29 2005/01/10 01:05:59 zhen Exp $ """ Builder class for a LiveCD stage2 build. @@ -73,7 +73,7 @@ class livecd_stage2_target(generic_stage_target): if self.settings.has_key("portage_confdir"): print "Configuring /etc/portage..." cmd("rm -rf "+self.settings["chroot_path"]+"/etc/portage","Error zapping /etc/portage") - cmd("cp -R "+self.settings["portage_confdir"]+" "+self.settings["chroot_path"]+\ + cmd("cp -R "+self.settings["portage_confdir"]+"/ "+self.settings["chroot_path"]+\ "/etc/portage","Error copying /etc/portage") for x in self.mounts: -- 2.26.2