From: Jeremy Olexa Date: Wed, 7 Dec 2011 15:58:25 +0000 (+0000) Subject: s:/etc/make.profile:/etc/portage/make.profile:g - Use new location X-Git-Tag: CATALYST-2.0.9~1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=98727c755fdf5ecc1863e29f50da02b55ce5160c;p=catalyst.git s:/etc/make.profile:/etc/portage/make.profile:g - Use new location Take 2, specify target symlink better and create /etc/portage first (fails with stage2 otherwise) Conflicts: modules/generic_stage_target.py targets/stage1/stage1-controller.sh --- diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 44b314ad..5947e9a1 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -813,12 +813,12 @@ class generic_stage_target(generic_target): # TODO: zmedico and I discussed making this a directory and pushing # in a parent file, as well as other user-specified configuration. print "Configuring profile link..." - cmd("rm -f "+self.settings["chroot_path"]+"/etc/make.profile",\ + cmd("rm -f "+self.settings["chroot_path"]+"/etc/portage/make.profile",\ "Error zapping profile link",env=self.env) cmd("mkdir -p "+self.settings["chroot_path"]+"/etc/portage/") cmd("ln -sf ../../usr/portage/profiles/"+\ self.settings["target_profile"]+" "+\ - self.settings["chroot_path"]+"/etc/make.profile",\ + self.settings["chroot_path"]+"/etc/portage/make.profile",\ "Error creating profile link",env=self.env) touch(self.settings["autoresume_path"]+"config_profile_link")