1 |
commit: a338869a02f15b6cef14a6c977792a38720fb2d6 |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 30 23:56:02 2013 +0000 |
4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
5 |
CommitDate: Tue Dec 31 17:59:08 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=a338869a |
7 |
|
8 |
modules/generic_stage_target.py, Create SOURCE_MOUNTS_DEFAULTS |
9 |
|
10 |
Similarly to TARGET_MOUNTS_DEFAULTS this is a temporary location. |
11 |
This will simplify the migration to being fully configurable. |
12 |
It also simplifies initialization somewhat. |
13 |
|
14 |
--- |
15 |
catalyst/targets/generic_stage_target.py | 38 ++++++++++++++++++-------------- |
16 |
1 file changed, 22 insertions(+), 16 deletions(-) |
17 |
|
18 |
diff --git a/catalyst/targets/generic_stage_target.py b/catalyst/targets/generic_stage_target.py |
19 |
index f0abe08..47513d1 100644 |
20 |
--- a/catalyst/targets/generic_stage_target.py |
21 |
+++ b/catalyst/targets/generic_stage_target.py |
22 |
@@ -22,6 +22,15 @@ TARGET_MOUNTS_DEFAULTS = { |
23 |
"proc": "/proc", |
24 |
} |
25 |
|
26 |
+SOURCE_MOUNTS_DEFAULTS = { |
27 |
+ "dev": "/dev", |
28 |
+ "devpts": "/dev/pts", |
29 |
+ "distdir": "/usr/portage/distfiles", |
30 |
+ "portdir": "/usr/portage", |
31 |
+ "port_tmpdir": "tmpfs", |
32 |
+ "proc": "/proc", |
33 |
+ } |
34 |
+ |
35 |
# for convienience |
36 |
pjoin = os.path.join |
37 |
|
38 |
@@ -198,22 +207,19 @@ class generic_stage_target(generic_target): |
39 |
""" Setup our mount points """ |
40 |
# initialize our target mounts. |
41 |
self.target_mounts = TARGET_MOUNTS_DEFAULTS.copy() |
42 |
- if "SNAPCACHE" in self.settings: |
43 |
- self.mounts = ["proc", "dev", "portdir", "distdir", "port_tmpdir"] |
44 |
- self.mountmap = { |
45 |
- "dev": "/dev", |
46 |
- "devpts": "/dev/pts", |
47 |
- "distdir": self.settings["distdir"], |
48 |
- "portdir": normpath("/".join([ |
49 |
- self.settings["snapshot_cache_path"], |
50 |
- self.settings["repo_name"], |
51 |
- ])), |
52 |
- "port_tmpdir": "tmpfs"} |
53 |
- "proc": "/proc", |
54 |
- else: |
55 |
- self.mounts = ["proc", "dev", "distdir", "port_tmpdir"] |
56 |
- self.mountmap = {"proc":"/proc", "dev":"/dev", "devpts":"/dev/pts", |
57 |
- "distdir":self.settings["distdir"], "port_tmpdir":"tmpfs"} |
58 |
+ |
59 |
+ self.mounts = ["proc", "dev", "portdir", "distdir", "port_tmpdir"] |
60 |
+ # initialize our source mounts |
61 |
+ self.mountmap = SOURCE_MOUNTS_DEFAULTS.copy() |
62 |
+ # update them from settings |
63 |
+ self.mountmap["distdir"] = self.settings["distdir"] |
64 |
+ self.mountmap["portdir"] = normpath("/".join([ |
65 |
+ self.settings["snapshot_cache_path"], |
66 |
+ self.settings["repo_name"], |
67 |
+ ])) |
68 |
+ if "SNAPCACHE" not in self.settings: |
69 |
+ self.mounts.remove("portdir") |
70 |
+ #self.mountmap["portdir"] = None |
71 |
if os.uname()[0] == "Linux": |
72 |
self.mounts.append("devpts") |