| 1 |
commit: c257c5d51c3936b0a5bafee7aa40a4ff340cc89a |
| 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: Wed Jan 22 04:28:54 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=c257c5d5 |
| 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/base/stagebase.py | 24 ++++++++++++++---------- |
| 16 |
catalyst/defaults.py | 9 +++++++++ |
| 17 |
2 files changed, 23 insertions(+), 10 deletions(-) |
| 18 |
|
| 19 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 20 |
index fd7fda5..7e09ed1 100644 |
| 21 |
--- a/catalyst/base/stagebase.py |
| 22 |
+++ b/catalyst/base/stagebase.py |
| 23 |
@@ -13,7 +13,7 @@ from catalyst.support import (CatalystError, msg, file_locate, normpath, |
| 24 |
from catalyst.base.targetbase import TargetBase |
| 25 |
from catalyst.base.clearbase import ClearBase |
| 26 |
from catalyst.base.genbase import GenBase |
| 27 |
-from catalyst.defaults import TARGET_MOUNT_DEFAULTS |
| 28 |
+from catalyst.defaults import TARGET_MOUNT_DEFAULTS, SOURCE_MOUNT_DEFAULTS |
| 29 |
from catalyst.lock import LockDir |
| 30 |
from catalyst.fileops import ensure_dirs, pjoin |
| 31 |
from catalyst.base.resume import AutoResume |
| 32 |
@@ -194,15 +194,19 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 33 |
""" Setup our mount points """ |
| 34 |
# initialize our target mounts. |
| 35 |
self.target_mounts = TARGET_MOUNT_DEFAULTS.copy() |
| 36 |
- if "snapcache" in self.settings["options"]: |
| 37 |
- self.mounts=["proc", "dev", 'portdir', 'distdir', 'port_tmpdir'] |
| 38 |
- self.mountmap={"proc":"/proc", "dev":"/dev", "pts":"/dev/pts", |
| 39 |
- "portdir":normpath(self.settings["snapshot_cache_path"]+"/" + self.settings["repo_name"]), |
| 40 |
- "distdir":self.settings["distdir"],"port_tmpdir":"tmpfs"} |
| 41 |
- else: |
| 42 |
- self.mounts=["proc","dev", "distdir", "port_tmpdir"] |
| 43 |
- self.mountmap={"proc":"/proc", "dev":"/dev", "pts":"/dev/pts", |
| 44 |
- "distdir":self.settings["distdir"], "port_tmpdir":"tmpfs"} |
| 45 |
+ |
| 46 |
+ self.mounts = ["proc", "dev", "portdir", "distdir", "port_tmpdir"] |
| 47 |
+ # initialize our source mounts |
| 48 |
+ self.mountmap = SOURCE_MOUNT_DEFAULTS.copy() |
| 49 |
+ # update them from settings |
| 50 |
+ self.mountmap["distdir"] = self.settings["distdir"] |
| 51 |
+ self.mountmap["portdir"] = normpath("/".join([ |
| 52 |
+ self.settings["snapshot_cache_path"], |
| 53 |
+ self.settings["repo_name"], |
| 54 |
+ ])) |
| 55 |
+ if "snapcache" not in self.settings["options"]: |
| 56 |
+ self.mounts.remove("portdir") |
| 57 |
+ #self.mountmap["portdir"] = None |
| 58 |
if os.uname()[0] == "Linux": |
| 59 |
self.mounts.append("devpts") |
| 60 |
|
| 61 |
|
| 62 |
diff --git a/catalyst/defaults.py b/catalyst/defaults.py |
| 63 |
index 11cecb3..27bcff4 100644 |
| 64 |
--- a/catalyst/defaults.py |
| 65 |
+++ b/catalyst/defaults.py |
| 66 |
@@ -94,6 +94,15 @@ TARGET_MOUNT_DEFAULTS = { |
| 67 |
"proc": "/proc", |
| 68 |
} |
| 69 |
|
| 70 |
+SOURCE_MOUNT_DEFAULTS = { |
| 71 |
+ "dev": "/dev", |
| 72 |
+ "devpts": "/dev/pts", |
| 73 |
+ "distdir": None, # set from settings options |
| 74 |
+ "portdir": None, # set from settings options |
| 75 |
+ "port_tmpdir": "tmpfs", |
| 76 |
+ "proc": "/proc", |
| 77 |
+ } |
| 78 |
+ |
| 79 |
# legend: key: message |
| 80 |
option_messages = { |
| 81 |
"autoresume": "Autoresuming support enabled.", |
Archives