From: Brian Dolbec <dolsen@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Cc: Brian Dolbec <dolsen@gentoo.org>
Subject: [gentoo-catalyst] [PATCH 1/6] modules/generic_stage_target.py: Use portdir, distdir,... instead of paths for keys
Date: Sun, 29 Dec 2013 17:50:48 -0800 [thread overview]
Message-ID: <1388368253-22018-2-git-send-email-dolsen@gentoo.org> (raw)
In-Reply-To: <1388368253-22018-1-git-send-email-dolsen@gentoo.org>
If snapcache is enabled, self.mounts and self.mountmap had not been modified
like they were if it was not enabled.
Fix a missed self.mounts key change from a path as key.
original patch: 27b751ffd9594e0128a3d70f83c7af18dab03838
Added a print statement for debugging to be converted to logging in the future.
---
modules/generic_stage_target.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 3e60f72..6c8cdbc 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -174,10 +174,10 @@ class generic_stage_target(generic_target):
""" Setup our mount points """
if "SNAPCACHE" in self.settings:
- self.mounts=["/proc","/dev","/usr/portage","/usr/portage/distfiles","/var/tmp/portage"]
- self.mountmap={"/proc":"/proc","/dev":"/dev","devpts":"/dev/pts",
- "/usr/portage":self.settings["snapshot_cache_path"]+"/portage",\
- "/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs"}
+ self.mounts=["proc", "dev", "portdir", "distdir", "port_tmpdir"]
+ self.mountmap={"proc": "/proc", "dev": "/dev", "devpts": "/dev/pts",
+ "portdir": self.settings["snapshot_cache_path"] + "/portage",
+ "distdir": self.settings["distdir"], "port_tmpdir": "tmpfs"}
else:
self.mounts = ["proc", "dev", "distdir", "port_tmpdir"]
self.mountmap = {"proc":"/proc", "dev":"/dev", "devpts":"/dev/pts",
@@ -904,7 +904,8 @@ class generic_stage_target(generic_target):
os.makedirs(self.mountmap[x],0755)
src=self.mountmap[x]
- if "SNAPCACHE" in self.settings and x == "/usr/portage":
+ #print "bind(); src =", src
+ if "SNAPCACHE" in self.settings and x == "portdir":
self.snapshot_lock_object.read_lock()
if os.uname()[0] == "FreeBSD":
if src == "/dev":
--
1.8.3.2
next prev parent reply other threads:[~2013-12-30 1:51 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-29 1:57 [gentoo-catalyst] Patches to fix rebased patches already applied to current master Brian Dolbec
2013-12-29 1:57 ` [gentoo-catalyst] [PATCH 1/6] modules/generic_stage_target.py: USE portdir, distdir,... instead of paths for keys Brian Dolbec
2013-12-29 2:16 ` W. Trevor King
2013-12-29 1:57 ` [gentoo-catalyst] [PATCH 2/6] Fix a missed self.settings["repo_name"] migration Brian Dolbec
2013-12-29 2:19 ` W. Trevor King
2013-12-29 5:08 ` Brian Dolbec
2013-12-29 1:57 ` [gentoo-catalyst] [PATCH 3/6] Add "local_overlay" to configdefaults Brian Dolbec
2013-12-29 2:24 ` W. Trevor King
2013-12-29 1:57 ` [gentoo-catalyst] [PATCH 4/6] Fix a missed self.mounts key change from a path as key Brian Dolbec
2013-12-29 2:30 ` W. Trevor King
2013-12-29 1:57 ` [gentoo-catalyst] [PATCH 5/6] modules/generic_stage_target.py, modules/stage1_target.py: Add a target_mounts dictionary Brian Dolbec
2013-12-29 2:49 ` W. Trevor King
2013-12-29 3:52 ` W. Trevor King
2013-12-29 4:58 ` Brian Dolbec
2013-12-31 2:54 ` [gentoo-catalyst] mounts changes was: " Brian Dolbec
2013-12-31 3:06 ` [gentoo-catalyst] Re: mounts changes W. Trevor King
2014-01-01 6:05 ` [gentoo-catalyst] mounts changes was: [PATCH 5/6] modules/generic_stage_target.py, modules/stage1_target.py: Add a target_mounts dictionary Jorge Manuel B. S. Vicetto
2014-01-01 18:53 ` W. Trevor King
2014-01-02 2:50 ` Jorge Manuel B. S. Vicetto
2013-12-29 5:02 ` [gentoo-catalyst] " Brian Dolbec
2013-12-29 5:26 ` Alec Warner
2013-12-29 6:01 ` Brian Dolbec
2013-12-29 1:57 ` [gentoo-catalyst] [PATCH 6/6] Set mountmap["icecream"] from settings for now Brian Dolbec
2013-12-29 2:53 ` W. Trevor King
2013-12-29 3:00 ` W. Trevor King
2013-12-30 1:50 ` [gentoo-catalyst] Patches to fix rebased patches already applied to current master. Version-2 Brian Dolbec
2013-12-30 1:50 ` Brian Dolbec [this message]
2013-12-30 3:54 ` [gentoo-catalyst] [PATCH 1/6] modules/generic_stage_target.py: Use portdir, distdir,... instead of paths for keys W. Trevor King
2013-12-30 1:50 ` [gentoo-catalyst] [PATCH 2/6] Fix a missed self.settings["repo_name"] migration Brian Dolbec
2013-12-30 3:58 ` W. Trevor King
2013-12-30 1:50 ` [gentoo-catalyst] [PATCH 3/6] Fixes commit 463d98f (modules/generic_stage_target.py: Use a 'local_overlay' setting instead of hard-coding '/usr/local/portage', 2012-12-19).Add "local_overlay" to configdefaults Brian Dolbec
2013-12-30 4:02 ` W. Trevor King
2013-12-30 5:32 ` Brian Dolbec
2013-12-30 6:35 ` W. Trevor King
2013-12-30 6:48 ` Brian Dolbec
2013-12-30 1:50 ` [gentoo-catalyst] [PATCH 4/6] Fix mounts and mountmap port_logdir code block Brian Dolbec
2013-12-30 4:09 ` W. Trevor King
2013-12-30 5:46 ` Brian Dolbec
2013-12-30 1:50 ` [gentoo-catalyst] [PATCH 5/6] modules/generic_stage_target.py, modules/stage1_target.py: Add a target_mounts dictionary Brian Dolbec
2013-12-30 4:16 ` W. Trevor King
2013-12-30 1:50 ` [gentoo-catalyst] [PATCH 6/6] Set mountmap["icecream"] from settings for now Brian Dolbec
2013-12-30 4:19 ` W. Trevor King
2013-12-30 3:33 ` [gentoo-catalyst] Patches to fix rebased patches already applied to current master. Version-2 W. Trevor King
2014-01-03 4:16 ` [PATCH v3 0/6] "Re: " Brian Dolbec
2014-01-03 4:16 ` [gentoo-catalyst] [PATCH v3 1/6] modules/generic_stage_target.py: Use portdir, distdir, ... instead of paths for keys Brian Dolbec
2014-01-03 4:30 ` [gentoo-catalyst] " W. Trevor King
2014-01-03 4:16 ` [gentoo-catalyst] [PATCH v3 2/6] Fix a missed self.settings["repo_name"] migration Brian Dolbec
2014-01-03 4:33 ` W. Trevor King
2014-01-03 4:53 ` [gentoo-catalyst] [PATCH v4 1/1] " Brian Dolbec
2014-01-03 5:02 ` Brian Dolbec
2014-01-03 5:09 ` [gentoo-catalyst] [PATCH v5 " Brian Dolbec
2014-01-03 4:16 ` [gentoo-catalyst] [PATCH v3 3/6] Add "local_overlay" to configdefaults Brian Dolbec
2014-01-03 4:36 ` W. Trevor King
2014-01-03 4:16 ` [gentoo-catalyst] [PATCH v3 4/6] Fix mounts and mountmap port_logdir code block Brian Dolbec
2014-01-03 4:40 ` W. Trevor King
2014-01-03 4:16 ` [gentoo-catalyst] [PATCH v3 5/6] modules/generic_stage_target.py, modules/stage1_target.py: Add a target_mounts dictionary Brian Dolbec
2014-01-03 4:47 ` W. Trevor King
2014-01-03 6:08 ` W. Trevor King
2014-01-03 6:55 ` Brian Dolbec
2014-01-03 4:16 ` [gentoo-catalyst] [PATCH v3 6/6] Set mountmap["icecream"] from settings for now Brian Dolbec
2014-01-03 4:48 ` W. Trevor King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1388368253-22018-2-git-send-email-dolsen@gentoo.org \
--to=dolsen@gentoo.org \
--cc=gentoo-catalyst@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox