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 44b314ad862b4fa7bd3035729479d84658a8c24f..5947e9a1d1acfb89dca2b136b9e9f56bb7c2d56c 100644 (file)
--- 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")