From 2b2decf4cfc01ad83fec687957d117e8bde23f58 Mon Sep 17 00:00:00 2001 From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" Date: Sun, 6 May 2012 23:27:27 +0000 Subject: [PATCH] Stop dropping /etc/portage from the stages and update its contents from portage_confdir. --- modules/generic_stage_target.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 7a5d0a0a..5c15609f 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -830,10 +830,8 @@ class generic_stage_target(generic_target): else: if self.settings.has_key("portage_confdir"): print "Configuring /etc/portage..." - cmd("rm -rf "+self.settings["chroot_path"]+"/etc/portage",\ - "Error zapping /etc/portage",env=self.env) - cmd("cp -R "+self.settings["portage_confdir"]+"/ "+\ - self.settings["chroot_path"]+"/etc/portage",\ + cmd("rsync -a "+self.settings["portage_confdir"]+"/ "+\ + self.settings["chroot_path"]+"/etc/portage/",\ "Error copying /etc/portage",env=self.env) touch(self.settings["autoresume_path"]+"setup_confdir") -- 2.26.2